From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 18 Jul 2008 17:31:12 +0000 (+0200)
Subject: Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3e370b29d35fb01bfb92c2814d6f79bf6a2cb970;p=linux.git

Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks

Conflicts:

	drivers/pci/quirks.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

3e370b29d35fb01bfb92c2814d6f79bf6a2cb970
diff --cc arch/x86/pci/common.c
index 00a319cd5be30,b67732bbb85a3..1485a26ddcef1
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@@ -20,10 -20,9 +20,11 @@@
  unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2 |
  				PCI_PROBE_MMCONF;
  
+ unsigned int pci_early_dump_regs;
  static int pci_bf_sort;
  int pci_routeirq;
 +int noioapicquirk;
 +int noioapicreroute = 1;
  int pcibios_last_bus = -1;
  unsigned long pirq_table_addr;
  struct pci_bus *pci_root_bus;
diff --cc include/linux/pci.h
index 6755cf5ac1094,a6a088e1a8049..cfc2297c3e285
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@@ -196,10 -208,8 +213,9 @@@ struct pci_dev 
  	unsigned int	is_added:1;
  	unsigned int	is_busmaster:1; /* device is busmaster */
  	unsigned int	no_msi:1;	/* device may not use msi */
- 	unsigned int	no_d1d2:1;   /* only allow d0 or d3 */
  	unsigned int	block_ucfg_access:1;	/* userspace config space access is blocked */
  	unsigned int	broken_parity_status:1;	/* Device generates false positive parity */
 +	unsigned int	irq_reroute_variant:2;	/* device needs IRQ rerouting variant */
  	unsigned int 	msi_enabled:1;
  	unsigned int	msix_enabled:1;
  	unsigned int	is_managed:1;