The patch fixes 4 errors, no changes in the generated binary file:
paolo@paolo-desktop:/tmp/a$ size setup_32.o*
text data bss dec hex filename
3526 7406 885 11817 2e29 setup_32.o
3526 7406 885 11817 2e29 setup_32.o.after
paolo@paolo-desktop:/tmp/a$ md5sum setup_32.o*
d238f977facb3b4e4ee6a18390678376 setup_32.o
d238f977facb3b4e4ee6a18390678376 setup_32.o.after
Signed-off-by: Paolo Ciarrocchi <[email protected]>
---
arch/x86/kernel/setup_32.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c
index f595d7b..b120a1c 100644
--- a/arch/x86/kernel/setup_32.c
+++ b/arch/x86/kernel/setup_32.c
@@ -372,7 +372,7 @@ unsigned long __init find_max_low_pfn(void)
highmem_pages = 0;
}
if (highmem_pages) {
- if (max_low_pfn-highmem_pages < 64*1024*1024/PAGE_SIZE){
+ if (max_low_pfn-highmem_pages < 64*1024*1024/PAGE_SIZE) {
printk(KERN_ERR "highmem size %uMB results in smaller than 64MB lowmem, ignoring it.\n", pages_to_mb(highmem_pages));
highmem_pages = 0;
}
@@ -454,9 +454,8 @@ static unsigned long __init setup_memory(void)
#ifdef CONFIG_HIGHMEM
highstart_pfn = highend_pfn = max_pfn;
- if (max_pfn > max_low_pfn) {
+ if (max_pfn > max_low_pfn)
highstart_pfn = max_low_pfn;
- }
printk(KERN_NOTICE "%ldMB HIGHMEM available.\n",
pages_to_mb(highend_pfn - highstart_pfn));
num_physpages = highend_pfn;
@@ -752,7 +751,7 @@ void __init setup_arch(char **cmdline_p)
apm_info.bios = boot_params.apm_bios_info;
ist_info = boot_params.ist_info;
saved_videomode = boot_params.hdr.vid_mode;
- if( boot_params.sys_desc_table.length != 0 ) {
+ if (boot_params.sys_desc_table.length != 0) {
set_mca_bus(boot_params.sys_desc_table.table[3] & 0x2);
machine_id = boot_params.sys_desc_table.table[0];
machine_submodel_id = boot_params.sys_desc_table.table[1];
--
1.5.4.2.316.gf7a7