From 94ba979442874ae98f9c21f99705e0e6a02bdd67 Mon Sep 17 00:00:00 2001 From: David Daney Date: Mon, 13 Jul 2009 11:15:20 -0700 Subject: [PATCH] --- yaml --- r: 162847 b: refs/heads/master c: 9d24bafb0d1ecf636f71a56f9d6f071f5c7a882d h: refs/heads/master i: 162845: 0f812c6f30355a0ec41976b6420eb270e3b74bf3 162843: ec63d57a292d5ecdfcad5ad97c714ea875abd269 162839: b322d704dbc5cfaadd5529cf44a7aa61a415c280 162831: aa5445ea65f326d515514b20b2916354cb331a4a 162815: 78e05b1b98d8389846332ab559dacdf02bbac17c v: v3 --- [refs] | 2 +- .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a372918a9c69..2745d15410c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b791d1193af9772040e592d5aa161790f800b762 +refs/heads/master: 9d24bafb0d1ecf636f71a56f9d6f071f5c7a882d diff --git a/trunk/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h b/trunk/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h index 3d830756b13a..425e708d4fb9 100644 --- a/trunk/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h +++ b/trunk/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h @@ -31,12 +31,16 @@ #define cpu_has_cache_cdex_s 0 #define cpu_has_prefetch 1 +#define cpu_has_llsc 1 /* - * We should disable LL/SC on non SMP systems as it is faster to - * disable interrupts for atomic access than a LL/SC. Unfortunatly we - * cannot as this breaks asm/futex.h + * We Disable LL/SC on non SMP systems as it is faster to disable + * interrupts for atomic access than a LL/SC. */ -#define cpu_has_llsc 1 +#ifdef CONFIG_SMP +# define kernel_uses_llsc 1 +#else +# define kernel_uses_llsc 0 +#endif #define cpu_has_vtag_icache 1 #define cpu_has_dc_aliases 0 #define cpu_has_ic_fills_f_dc 0