3 files changed, 6 insertions, 2 deletions

diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c
index 3ee91869521..f85b928ffac 100644
--- a/arch/m68k/kernel/process.c
+++ b/arch/m68k/kernel/process.c
@@ -335,7 +335,7 @@ void dump_thread(struct pt_regs * regs, struct user * dump)
         if (dump->start_stack < TASK_SIZE)
                 dump->u_ssize = ((unsigned long) (TASK_SIZE - dump->start_stack)) >> PAGE_SHIFT;
 
-        dump->u_ar0 = (struct user_regs_struct *)((int)&dump->regs - (int)dump);
+        dump->u_ar0 = offsetof(struct user, regs);
         sw = ((struct switch_stack *)regs) - 1;
         dump->regs.d1 = regs->d1;
         dump->regs.d2 = regs->d2;
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index e6e49289f78..4b749c41646 100644
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -313,7 +313,7 @@ int main(void)
         DEFINE(CLOCK_REALTIME, CLOCK_REALTIME);
         DEFINE(CLOCK_MONOTONIC, CLOCK_MONOTONIC);
         DEFINE(NSEC_PER_SEC, NSEC_PER_SEC);
-        DEFINE(CLOCK_REALTIME_RES, (KTIME_MONOTONIC_RES).tv64);
+        DEFINE(CLOCK_REALTIME_RES, MONOTONIC_RES_NSEC);
 
 #ifdef CONFIG_BUG
         DEFINE(BUG_ENTRY_SIZE, sizeof(struct bug_entry));
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index c95482b6b6d..9d0acedf5f3 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -52,6 +52,10 @@ config HAVE_LATENCYTOP_SUPPORT
 config SEMAPHORE_SLEEPERS
         def_bool y
 
+config FAST_CMPXCHG_LOCAL
+        bool
+        default y
+
 config MMU
         def_bool y