git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/sam/kernel/linux-2.6/
[pandora-kernel.git]
/
arch
/
ia64
/
kernel
/
setup.c
diff --git
a/arch/ia64/kernel/setup.c
b/arch/ia64/kernel/setup.c
index
eb388e2
..
6a33f41
100644
(file)
--- a/
arch/ia64/kernel/setup.c
+++ b/
arch/ia64/kernel/setup.c
@@
-22,7
+22,6
@@
* 06/24/99 W.Drummond added boot_cpu_data.
* 05/28/05 Z. Menyhart Dynamic stride size for "flush_icache_range()"
*/
* 06/24/99 W.Drummond added boot_cpu_data.
* 05/28/05 Z. Menyhart Dynamic stride size for "flush_icache_range()"
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/init.h>
@@
-37,6
+36,7
@@
#include <linux/string.h>
#include <linux/threads.h>
#include <linux/tty.h>
#include <linux/string.h>
#include <linux/threads.h>
#include <linux/tty.h>
+#include <linux/dmi.h>
#include <linux/serial.h>
#include <linux/serial_core.h>
#include <linux/efi.h>
#include <linux/serial.h>
#include <linux/serial_core.h>
#include <linux/efi.h>
@@
-259,6
+259,7
@@
reserve_memory (void)
n++;
num_rsvd_regions = n;
n++;
num_rsvd_regions = n;
+ BUG_ON(IA64_MAX_RSVD_REGIONS + 1 < n);
sort_regions(rsvd_region, num_rsvd_regions);
}
sort_regions(rsvd_region, num_rsvd_regions);
}
@@
-433,7
+434,7
@@
setup_arch (char **cmdline_p)
find_memory();
/* process SAL system table: */
find_memory();
/* process SAL system table: */
- ia64_sal_init(
efi.sal_systab
);
+ ia64_sal_init(
__va(efi.sal_systab)
);
ia64_setup_printk_clock();
ia64_setup_printk_clock();
@@
-887,3
+888,10
@@
check_bugs (void)
ia64_patch_mckinley_e9((unsigned long) __start___mckinley_e9_bundles,
(unsigned long) __end___mckinley_e9_bundles);
}
ia64_patch_mckinley_e9((unsigned long) __start___mckinley_e9_bundles,
(unsigned long) __end___mckinley_e9_bundles);
}
+
+static int __init run_dmi_scan(void)
+{
+ dmi_scan_machine();
+ return 0;
+}
+core_initcall(run_dmi_scan);