From 57806085b94c0bed038b2b0bd32eb92f12c3417f Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 23 Sep 2010 13:30:13 -0700 Subject: [PATCH] --- yaml --- r: 210933 b: refs/heads/master c: 91e71c12c506e15028c252a5a097723f41c518dd h: refs/heads/master i: 210931: 73b19488a5fea9285716989d4e865e6c2b0a379f v: v3 --- [refs] | 2 +- trunk/arch/mn10300/Kconfig | 1 - trunk/arch/mn10300/include/asm/bitops.h | 4 ++-- trunk/arch/mn10300/include/asm/signal.h | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 5631fdab9a75..42b3aab0380e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc6e756894b703952fd277a1f98a5d93e7ba847a +refs/heads/master: 91e71c12c506e15028c252a5a097723f41c518dd diff --git a/trunk/arch/mn10300/Kconfig b/trunk/arch/mn10300/Kconfig index 444b9f918fdf..7c2a2f7f8dc1 100644 --- a/trunk/arch/mn10300/Kconfig +++ b/trunk/arch/mn10300/Kconfig @@ -8,7 +8,6 @@ mainmenu "Linux Kernel Configuration" config MN10300 def_bool y select HAVE_OPROFILE - select HAVE_ARCH_TRACEHOOK config AM33 def_bool y diff --git a/trunk/arch/mn10300/include/asm/bitops.h b/trunk/arch/mn10300/include/asm/bitops.h index f49ac49e09ad..3f50e9661076 100644 --- a/trunk/arch/mn10300/include/asm/bitops.h +++ b/trunk/arch/mn10300/include/asm/bitops.h @@ -229,9 +229,9 @@ int ffs(int x) #include #define ext2_set_bit_atomic(lock, nr, addr) \ - test_and_set_bit((nr) ^ 0x18, (addr)) + test_and_set_bit((nr), (addr)) #define ext2_clear_bit_atomic(lock, nr, addr) \ - test_and_clear_bit((nr) ^ 0x18, (addr)) + test_and_clear_bit((nr), (addr)) #include #include diff --git a/trunk/arch/mn10300/include/asm/signal.h b/trunk/arch/mn10300/include/asm/signal.h index 7e891fce2370..1865d72a86ff 100644 --- a/trunk/arch/mn10300/include/asm/signal.h +++ b/trunk/arch/mn10300/include/asm/signal.h @@ -78,7 +78,7 @@ typedef unsigned long sigset_t; /* These should not be considered constants from userland. */ #define SIGRTMIN 32 -#define SIGRTMAX (_NSIG-1) +#define SIGRTMAX _NSIG /* * SA_FLAGS values: