diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-10 13:30:08 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-10 13:30:08 -0400 |
| commit | 3dd392a407d15250a501fa109cc1f93fee95ef85 (patch) | |
| tree | c1faca3fa8bd0f7c8790b3e0887229b4a5a90e8b /arch/x86/mm/ioremap.c | |
| parent | b27a43c1e90582facad44de67d02bc9e9f900289 (diff) | |
| parent | d403a6484f0341bf0624d17ece46f24f741b6a92 (diff) | |
Merge branch 'linus' into x86/pat2
Conflicts:
arch/x86/mm/init_64.c
Diffstat (limited to 'arch/x86/mm/ioremap.c')
| -rw-r--r-- | arch/x86/mm/ioremap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index d03c461e045e..6ab3196d12b4 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c | |||
| @@ -440,7 +440,7 @@ void unxlate_dev_mem_ptr(unsigned long phys, void *addr) | |||
| 440 | return; | 440 | return; |
| 441 | } | 441 | } |
| 442 | 442 | ||
| 443 | int __initdata early_ioremap_debug; | 443 | static int __initdata early_ioremap_debug; |
| 444 | 444 | ||
| 445 | static int __init early_ioremap_debug_setup(char *str) | 445 | static int __init early_ioremap_debug_setup(char *str) |
| 446 | { | 446 | { |
| @@ -566,7 +566,7 @@ static inline void __init early_clear_fixmap(enum fixed_addresses idx) | |||
| 566 | } | 566 | } |
| 567 | 567 | ||
| 568 | 568 | ||
| 569 | int __initdata early_ioremap_nested; | 569 | static int __initdata early_ioremap_nested; |
| 570 | 570 | ||
| 571 | static int __init check_early_ioremap_leak(void) | 571 | static int __init check_early_ioremap_leak(void) |
| 572 | { | 572 | { |