Merge branch 'x86/asm' into x86/atomic

Merge reason:
	Conflict between LOCK_PREFIX_HERE and relative alternatives
	pointers

Resolved Conflicts:
	arch/x86/include/asm/alternative.h
	arch/x86/kernel/alternative.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

diff --cc arch/x86/include/asm/alternative.h
index e29a6c9bba005ecc8fc242c5adbdc3c9e70b78c3,714bf24172845313b62f08519d1c2ce49d9dc5da..92a9033c14d15df62bdba55c9dc42a2346e8fb7b
--- 1/arch/x86/include/asm/alternative.h
--- 2/arch/x86/include/asm/alternative.h
+++ b/arch/x86/include/asm/alternative.h
@@@ -28,17 -28,14 +28,17 @@@
   */
  
  #ifdef CONFIG_SMP
 -#define LOCK_PREFIX \
 +#define LOCK_PREFIX_HERE \
                ".section .smp_locks,\"a\"\n"   \
-               _ASM_ALIGN "\n"                 \
-               _ASM_PTR "671f\n" /* address */ \
+               ".balign 4\n"                   \
 -              ".long 661f - .\n" /* offset */ \
++              ".long 671f - .\n" /* offset */ \
                ".previous\n"                   \
 -              "661:\n\tlock; "
 +              "671:"
 +
 +#define LOCK_PREFIX LOCK_PREFIX_HERE "\n\tlock; "
  
  #else /* ! CONFIG_SMP */
 +#define LOCK_PREFIX_HERE ""
  #define LOCK_PREFIX ""
  #endif
  

diff --cc arch/x86/kernel/alternative.c
index 80b222ea4cf696551839161a5aabcb2acf937d0d,936738427223e40e9a48ba254aee7b7e5a71a143..70237732a6c7c5f62f941d5df0594f7386ca6a10
--- 1/arch/x86/kernel/alternative.c
--- 2/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@@ -233,19 -235,19 +235,20 @@@ void __init_or_module apply_alternative
  
  #ifdef CONFIG_SMP
  
- static void alternatives_smp_lock(u8 **start, u8 **end, u8 *text, u8 *text_end)
+ static void alternatives_smp_lock(const s32 *start, const s32 *end,
+                                 u8 *text, u8 *text_end)
  {
-       u8 **ptr;
+       const s32 *poff;
  
        mutex_lock(&text_mutex);
-       for (ptr = start; ptr < end; ptr++) {
-               if (*ptr < text)
-                       continue;
-               if (*ptr > text_end)
+       for (poff = start; poff < end; poff++) {
+               u8 *ptr = (u8 *)poff + *poff;
+ 
+               if (!*poff || ptr < text || ptr >= text_end)
                        continue;
                /* turn DS segment override prefix into lock prefix */
-               if (**ptr == 0x3e)
-                       text_poke(*ptr, ((unsigned char []){0xf0}), 1);
 -              text_poke(ptr, ((unsigned char []){0xf0}), 1);
++              if (*ptr == 0x3e)
++                      text_poke(ptr, ((unsigned char []){0xf0}), 1);
        };
        mutex_unlock(&text_mutex);
  }
@@@ -258,14 -261,13 +262,14 @@@ static void alternatives_smp_unlock(con
                return;
  
        mutex_lock(&text_mutex);
-       for (ptr = start; ptr < end; ptr++) {
-               if (*ptr < text)
-                       continue;
-               if (*ptr > text_end)
+       for (poff = start; poff < end; poff++) {
+               u8 *ptr = (u8 *)poff + *poff;
+ 
+               if (!*poff || ptr < text || ptr >= text_end)
                        continue;
                /* turn lock prefix into DS segment override prefix */
-               if (**ptr == 0xf0)
-                       text_poke(*ptr, ((unsigned char []){0x3E}), 1);
 -              text_poke(ptr, ((unsigned char []){0x3E}), 1);
++              if (*ptr == 0xf0)
++                      text_poke(ptr, ((unsigned char []){0x3E}), 1);
        };
        mutex_unlock(&text_mutex);
  }

diff --cc arch/x86/lib/Makefile
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc lib/Makefile
Simple merge