diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-18 03:35:56 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-18 03:35:56 -0500 |
| commit | 0421860a5a75b59a76b7a864a172eb090e3d0785 (patch) | |
| tree | df22f28abfa4c8bb77d650b674a44e0aedc586be /arch/x86/mm/tlb.c | |
| parent | cf655c36fad7b6488a56f18ab56f7d608ca6552b (diff) | |
| parent | 89ba4d12fca24d373e1b10fce498d68157bafaf0 (diff) | |
Merge branch 'rmobile/ag5' into rmobile-latest
Diffstat (limited to 'arch/x86/mm/tlb.c')
| -rw-r--r-- | arch/x86/mm/tlb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c index 49358481c733..12cdbb17ad18 100644 --- a/arch/x86/mm/tlb.c +++ b/arch/x86/mm/tlb.c | |||
| @@ -251,7 +251,7 @@ static void __cpuinit calculate_tlb_offset(void) | |||
| 251 | } | 251 | } |
| 252 | } | 252 | } |
| 253 | 253 | ||
| 254 | static int tlb_cpuhp_notify(struct notifier_block *n, | 254 | static int __cpuinit tlb_cpuhp_notify(struct notifier_block *n, |
| 255 | unsigned long action, void *hcpu) | 255 | unsigned long action, void *hcpu) |
| 256 | { | 256 | { |
| 257 | switch (action & 0xf) { | 257 | switch (action & 0xf) { |