Messages in this thread Patch in this message | | | Date | Wed, 09 Feb 2011 21:36:06 +0300 | From | Pavel Vasilyev <> | Subject | Re: [PATCH]: Not PCI_PROBE_MMCONF by default |
| |
09.02.2011 19:43, Yinghai Lu пишет: > On Wed, Feb 9, 2011 at 7:13 AM, Pavel Vasilyev <pavel@pavlinux.ru> wrote: >> Hi All! >> >> Do not set PCI_PROBE_MMCONF flag by default, and enable >> only if configured with CONFIG_PCI_MMCONFIG >> >> Signed-off-by: Pavel Vasilyev <pavel@pavlinux.ru> >> --- >> arch/x86/pci/common.c | 6 ++++-- >> 1 files changed, 4 insertions(+), 2 deletions(-) >> >> diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c >> index 5fe7502..625b477 100644 >> --- a/arch/x86/pci/common.c >> +++ b/arch/x86/pci/common.c >> @@ -17,8 +17,7 @@ >> #include <asm/smp.h> >> #include <asm/pci_x86.h> >> >> -unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2 | >> - PCI_PROBE_MMCONF; >> +unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2; >> >> unsigned int pci_early_dump_regs; >> static int pci_bf_sort; >> @@ -535,6 +534,9 @@ char * __devinit pcibios_setup(char *str) >> } >> #endif >> #ifdef CONFIG_PCI_MMCONFIG >> + >> + pci_probe |= PCI_PROBE_MMCONF; >> + >> else if (!strcmp(str, "nommconf")) { >> pci_probe &= ~PCI_PROBE_MMCONF; >> return NULL; >> > > did you try to do the compile test with CONFIG_PCI_MMCONFIG?
Oops :)
Signed-off-by: Pavel Vasilyev <pavel@pavlinux.ru> --- arch/x86/pci/common.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 5fe7502..48af4ce 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c @@ -17,8 +17,7 @@ #include <asm/smp.h> #include <asm/pci_x86.h>
-unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2 | - PCI_PROBE_MMCONF; +unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2;
unsigned int pci_early_dump_regs; static int pci_bf_sort; @@ -535,6 +534,9 @@ char * __devinit pcibios_setup(char *str) } #endif #ifdef CONFIG_PCI_MMCONFIG + + else if (pci_probe |= PCI_PROBE_MMCONF); + else if (!strcmp(str, "nommconf")) { pci_probe &= ~PCI_PROBE_MMCONF; return NULL; --
Pavel. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |