Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86

* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
  x86: fix deadlock, make pgd_lock irq-safe
  virtio: fix trivial build bug
  x86: fix mttr trimming
  x86: delay CPA self-test and repeat it
  x86: fix 64-bit sections
  generic: add __FINITDATA
  x86: remove suprious ifdefs from pageattr.c
  x86: mark the .rodata section also NX
  x86: fix iret exception recovery on 64-bit
  cpuidle: dubious one-bit signed bitfield in cpuidle.h
  x86: fix sparse warnings in powernow-k8.c
  x86: fix sparse error in traps_32.c
  x86: trivial sparse/checkpatch in quirks.c
  x86 ptrace: disallow null cs/ss
  MAINTAINERS: RDC R-321x SoC maintainer
  brk randomization: introduce CONFIG_COMPAT_BRK
  brk: check the lower bound properly
  x86: remove X2 workaround
  x86: make spurious fault handler aware of large mappings
  x86: make traps on entry code be debuggable in user space, 64-bit

1 files changed, 13 insertions, 13 deletions

diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c
index 3cd7a2dcd4fe..6ba33ca8715a 100644
--- a/arch/x86/kernel/quirks.c
+++ b/arch/x86/kernel/quirks.c
@@ -380,19 +380,19 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NVIDIA, 0x0367,
 void force_hpet_resume(void)
 {
         switch (force_hpet_resume_type) {
-            case ICH_FORCE_HPET_RESUME:
-                return ich_force_hpet_resume();
-
-            case OLD_ICH_FORCE_HPET_RESUME:
-                return old_ich_force_hpet_resume();
-
-            case VT8237_FORCE_HPET_RESUME:
-                return vt8237_force_hpet_resume();
-
-            case NVIDIA_FORCE_HPET_RESUME:
-                return nvidia_force_hpet_resume();
-
-            default:
+        case ICH_FORCE_HPET_RESUME:
+                ich_force_hpet_resume();
+                return;
+        case OLD_ICH_FORCE_HPET_RESUME:
+                old_ich_force_hpet_resume();
+                return;
+        case VT8237_FORCE_HPET_RESUME:
+                vt8237_force_hpet_resume();
+                return;
+        case NVIDIA_FORCE_HPET_RESUME:
+                nvidia_force_hpet_resume();
+                return;
+        default:
                 break;
         }
 }