Merge commit 'v2.6.27-rc1' into x86/microcode

Conflicts:

	arch/x86/kernel/microcode.c

Manual resolutions:

	arch/x86/kernel/microcode_amd.c
	arch/x86/kernel/microcode_intel.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 5 insertions, 1 deletions

diff --git a/arch/sh/kernel/cpu/sh4/probe.c b/arch/sh/kernel/cpu/sh4/probe.c
index be4926969181..2e42572b1b11 100644
--- a/arch/sh/kernel/cpu/sh4/probe.c
+++ b/arch/sh/kernel/cpu/sh4/probe.c
@@ -50,14 +50,18 @@ int __init detect_cpu_and_cache_system(void)
         boot_cpu_data.dcache.ways               = 1;
         boot_cpu_data.dcache.linesz             = L1_CACHE_BYTES;
 
+        /* We don't know the chip cut */
+        boot_cpu_data.cut_major = boot_cpu_data.cut_minor = -1;
+
         /*
          * Setup some generic flags we can probe on SH-4A parts
          */
-        if (((pvr >> 24) & 0xff) == 0x10) {
+        if (((pvr >> 16) & 0xff) == 0x10) {
                 if ((cvr & 0x10000000) == 0)
                         boot_cpu_data.flags |= CPU_HAS_DSP;
 
                 boot_cpu_data.flags |= CPU_HAS_LLSC;
+                boot_cpu_data.cut_major = pvr & 0x7f;
         }
 
         /* FPU detection works for everyone */