diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-03-16 16:33:56 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-03-16 16:34:01 +0100 |
| commit | 344c21c32287755b5cda0eeb84adb4546a57c1db (patch) | |
| tree | c1a7e2332e4650b62c451279d84e0ed0890995fa /arch/x86/pci/amd_bus.c | |
| parent | b87cf80af3ba4b4c008b4face3c68d604e1715c6 (diff) | |
| parent | 84fd1d35cc868a4f7590b6dbdae2d7761287b97a (diff) | |
| download | talos-obmc-linux-344c21c32287755b5cda0eeb84adb4546a57c1db.tar.gz talos-obmc-linux-344c21c32287755b5cda0eeb84adb4546a57c1db.zip | |
Merge branch 'x86/amd-nb' into x86/urgent
Merge reason: This is one followup commit that was not in x86/mm - merge it via the urgent path
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/pci/amd_bus.c')
| -rw-r--r-- | arch/x86/pci/amd_bus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c index e27dffbbb1a7..026e4931d162 100644 --- a/arch/x86/pci/amd_bus.c +++ b/arch/x86/pci/amd_bus.c @@ -350,7 +350,7 @@ static int __init early_fill_mp_bus_info(void) #define ENABLE_CF8_EXT_CFG (1ULL << 46) -static void enable_pci_io_ecs(void *unused) +static void __cpuinit enable_pci_io_ecs(void *unused) { u64 reg; rdmsrl(MSR_AMD64_NB_CFG, reg); |
