Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86, platform: Change is_untracked_pat_range() to bool; cleanup init

- Change is_untracked_pat_range() to return bool.
- Clean up the initialization of is_untracked_pat_range() -- by default,
we simply point it at is_ISA_range() directly.
- Move is_untracked_pat_range to the end of struct x86_platform, since
it is the newest field.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Jack Steiner <steiner@sgi.com>
LKML-Reference: <20091119202341.GA4420@sgi.com>

+5 -12
-2
arch/x86/include/asm/pat.h
··· 24 24 25 25 void io_free_memtype(resource_size_t start, resource_size_t end); 26 26 27 - int default_is_untracked_pat_range(u64 start, u64 end); 28 - 29 27 #endif /* _ASM_X86_PAT_H */
+2 -2
arch/x86/include/asm/x86_init.h
··· 113 113 114 114 /** 115 115 * struct x86_platform_ops - platform specific runtime functions 116 - * @is_untracked_pat_range exclude from PAT logic 117 116 * @calibrate_tsc: calibrate TSC 118 117 * @get_wallclock: get time from HW clock like RTC etc. 119 118 * @set_wallclock: set time back to HW clock 119 + * @is_untracked_pat_range exclude from PAT logic 120 120 */ 121 121 struct x86_platform_ops { 122 - int (*is_untracked_pat_range)(u64 start, u64 end); 123 122 unsigned long (*calibrate_tsc)(void); 124 123 unsigned long (*get_wallclock)(void); 125 124 int (*set_wallclock)(unsigned long nowtime); 125 + bool (*is_untracked_pat_range)(u64 start, u64 end); 126 126 }; 127 127 128 128 extern struct x86_init_ops x86_init;
+2 -2
arch/x86/kernel/apic/x2apic_uv_x.c
··· 37 37 static enum uv_system_type uv_system_type; 38 38 static u64 gru_start_paddr, gru_end_paddr; 39 39 40 - static int is_GRU_range(u64 start, u64 end) 40 + static inline bool is_GRU_range(u64 start, u64 end) 41 41 { 42 42 return start >= gru_start_paddr && end < gru_end_paddr; 43 43 } 44 44 45 - static int uv_is_untracked_pat_range(u64 start, u64 end) 45 + static bool uv_is_untracked_pat_range(u64 start, u64 end) 46 46 { 47 47 return is_ISA_range(start, end) || is_GRU_range(start, end); 48 48 }
+1 -1
arch/x86/kernel/x86_init.c
··· 70 70 }; 71 71 72 72 struct x86_platform_ops x86_platform = { 73 - .is_untracked_pat_range = default_is_untracked_pat_range, 74 73 .calibrate_tsc = native_calibrate_tsc, 75 74 .get_wallclock = mach_get_cmos_time, 76 75 .set_wallclock = mach_set_rtc_mmss, 76 + .is_untracked_pat_range = is_ISA_range, 77 77 };
-5
arch/x86/mm/pat.c
··· 349 349 return 0; 350 350 } 351 351 352 - int default_is_untracked_pat_range(u64 start, u64 end) 353 - { 354 - return is_ISA_range(start, end); 355 - } 356 - 357 352 /* 358 353 * req_type typically has one of the: 359 354 * - _PAGE_CACHE_WB