Magellan Linux

Annotation of /trunk/kernel26-xen/patches-2.6.25-r1/1072-2.6.25-xen-Parse-early-params-after-init_memory_mapping.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 606 - (hide annotations) (download)
Thu May 22 23:13:13 2008 UTC (16 years ago) by niro
File size: 1149 byte(s)
-ver bump to 2.6.25-magellan-r1:
- linux-2.6.25.4
- fbcondecor-0.9.4
- squashfs-3.3
- unionfs-2.3.3
- tuxonice-3.0-rc7
- linux-phc-0.3.0
- acpi-dstd-0.9a
- reiser4
- xen-3.2.0
. ipw3945-1.2.2

1 niro 606 From a37b168b13f4f2c98e586ac9e4389fe2b0936b13 Mon Sep 17 00:00:00 2001
2     From: Eduardo Habkost <ehabkost@redhat.com>
3     Date: Tue, 18 Dec 2007 17:38:40 -0200
4     Subject: [PATCH] Parse early params after init_memory_mapping()
5    
6     The xen console needs __va() to be working.
7    
8     The question is: is this the case for other early_printk() handlers?
9    
10     Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
11     ---
12     arch/x86/kernel/setup_64.c | 4 ++--
13     1 files changed, 2 insertions(+), 2 deletions(-)
14    
15     diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
16     index e81261a..5768ef5 100644
17     --- a/arch/x86/kernel/setup_64.c
18     +++ b/arch/x86/kernel/setup_64.c
19     @@ -313,8 +313,6 @@ void __init setup_arch(char **cmdline_p)
20     strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
21     *cmdline_p = command_line;
22    
23     - parse_early_param();
24     -
25     #ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT
26     if (init_ohci1394_dma_early)
27     init_ohci1394_dma_on_all_controllers();
28     @@ -342,6 +340,8 @@ void __init setup_arch(char **cmdline_p)
29     check_efer();
30    
31     init_memory_mapping(0, (end_pfn_map << PAGE_SHIFT));
32     + parse_early_param();
33     +
34     if (efi_enabled)
35     efi_init();
36    
37     --
38     1.5.4.1
39