[PATCH] PATCH 2.6: fix X86_VENDOR_ID offset in head.S

While reviewing my 2.4 backport of the 2.6 cpu capabilities (including
the Via RNG support), Mikael Pettersson noticed a bug in both my
backport, and 2.6:  when NCAPINTS (x86_capability array size) is
increased, one must adjust the offset in arch/i386/kernel/head.S also.

Contributed by Mikael Pettersson.

diff --git a/arch/i386/kernel/head.S b/arch/i386/kernel/head.S
index 3c546026c7c03398b4dc3857d5baf432c871dce4..9ae184fb815a995089c64a6a2d880fb406cb4315 100644 (file)
--- a/arch/i386/kernel/head.S
+++ b/arch/i386/kernel/head.S
@@ -35,7 +35,7 @@
 #define X86_HARD_MATH  CPU_PARAMS+6
 #define X86_CPUID      CPU_PARAMS+8
 #define X86_CAPABILITY CPU_PARAMS+12
-#define X86_VENDOR_ID  CPU_PARAMS+28
+#define X86_VENDOR_ID  CPU_PARAMS+36
 
 /*
  * Initialize page tables