Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 9219cec5f235240654a4887caff4589d1c536212

Authored by Linus Torvalds
2 parents 04919afb85 dd3c9c4b60
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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

Pull x86 fixes from Ingo Molnar:
 "Two fixlets:

   - fix a (rare-config) build bug
   - fix a next-gen SGI/UV hw/firmware enumeration bug"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Update UV3 hub revision ID
  x86/microcode: Correct Kconfig dependencies

Showing 2 changed files Side-by-side Diff

... ... @@ -1033,6 +1033,7 @@
1033 1033  
1034 1034 config MICROCODE
1035 1035 tristate "CPU microcode loading support"
  1036 + depends on CPU_SUP_AMD || CPU_SUP_INTEL
1036 1037 select FW_LOADER
1037 1038 ---help---
1038 1039  
arch/x86/kernel/apic/x2apic_uv_x.c
Diff comments   View file @ 9219cec
... ... @@ -113,7 +113,7 @@
113 113 break;
114 114 case UV3_HUB_PART_NUMBER:
115 115 case UV3_HUB_PART_NUMBER_X:
116   - uv_min_hub_revision_id += UV3_HUB_REVISION_BASE - 1;
  116 + uv_min_hub_revision_id += UV3_HUB_REVISION_BASE;
117 117 break;
118 118 }
119 119