Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 updates from Thomas Gleixner:
 "A pile of regression fixes and updates:

   - address the fallout of the patches which made the cpuid - nodeid
     relation permanent: Handling of invalid APIC ids and preventing
     pointless warning messages.

   - force eager FPU when protection keys are enabled. Protection keys
     are not generating FPU exceptions so they cannot work with the lazy
     FPU mechanism.

   - prevent force migration of interrupts which are not part of the CPU
     vector domain.

   - handle the fact that APIC ids are not updated in the ACPI/MADT
     tables on physical CPU hotplug

   - remove bash-isms from syscall table generator script

   - use the hypervisor supplied APIC frequency when running on VMware"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/pkeys: Make protection keys an "eager" feature
  x86/apic: Prevent pointless warning messages
  x86/acpi: Prevent LAPIC id 0xff from being accounted
  arch/x86: Handle non enumerated CPU after physical hotplug
  x86/unwind: Fix oprofile module link error
  x86/vmware: Skip lapic calibration on VMware
  x86/syscalls: Remove bash-isms in syscall table generator
  x86/irq: Prevent force migration of irqs which are not in the vector domain

1 files changed, 9 insertions, 6 deletions

diff --git a/arch/x86/entry/syscalls/syscalltbl.sh b/arch/x86/entry/syscalls/syscalltbl.sh
index cd3d3015d7df..751d1f992630 100644
--- a/arch/x86/entry/syscalls/syscalltbl.sh
+++ b/arch/x86/entry/syscalls/syscalltbl.sh
@@ -10,8 +10,11 @@ syscall_macro() {
 
     # Entry can be either just a function name or "function/qualifier"
     real_entry="${entry%%/*}"
-    qualifier="${entry:${#real_entry}}"         # Strip the function name
-    qualifier="${qualifier:1}"                  # Strip the slash, if any
+    if [ "$entry" = "$real_entry" ]; then
+        qualifier=
+    else
+        qualifier=${entry#*/}
+    fi
 
     echo "__SYSCALL_${abi}($nr, $real_entry, $qualifier)"
 }
@@ -22,7 +25,7 @@ emit() {
     entry="$3"
     compat="$4"
 
-    if [ "$abi" == "64" -a -n "$compat" ]; then
+    if [ "$abi" = "64" -a -n "$compat" ]; then
         echo "a compat entry for a 64-bit syscall makes no sense" >&2
         exit 1
     fi
@@ -45,17 +48,17 @@ emit() {
 grep '^[0-9]' "$in" | sort -n | (
     while read nr abi name entry compat; do
         abi=`echo "$abi" | tr '[a-z]' '[A-Z]'`
-        if [ "$abi" == "COMMON" -o "$abi" == "64" ]; then
+        if [ "$abi" = "COMMON" -o "$abi" = "64" ]; then
             # COMMON is the same as 64, except that we don't expect X32
             # programs to use it.  Our expectation has nothing to do with
             # any generated code, so treat them the same.
             emit 64 "$nr" "$entry" "$compat"
-        elif [ "$abi" == "X32" ]; then
+        elif [ "$abi" = "X32" ]; then
             # X32 is equivalent to 64 on an X32-compatible kernel.
             echo "#ifdef CONFIG_X86_X32_ABI"
             emit 64 "$nr" "$entry" "$compat"
             echo "#endif"
-        elif [ "$abi" == "I386" ]; then
+        elif [ "$abi" = "I386" ]; then
             emit "$abi" "$nr" "$entry" "$compat"
         else
             echo "Unknown abi $abi" >&2