diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2012-06-20 14:22:32 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-06-20 14:22:34 +0200 |
| commit | 6a991acceedce3ca93caef8ba7af2468c9451614 (patch) | |
| tree | 1997d71fc57bdebd12fc70a73070281614b52f15 /include/linux/pci.h | |
| parent | x86: Save cr2 in NMI in case NMIs take a page fault (for i386) (diff) | |
| parent | Linux 3.5-rc3 (diff) | |
| download | linux-dev-6a991acceedce3ca93caef8ba7af2468c9451614.tar.xz linux-dev-6a991acceedce3ca93caef8ba7af2468c9451614.zip | |
Merge commit 'v3.5-rc3' into x86/debug
Merge it in to pick up a fix that we are going to clean up in this
branch.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/pci.h')
| -rw-r--r-- | include/linux/pci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index d8c379dba6ad..fefb4e19bf6a 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -176,6 +176,8 @@ enum pci_dev_flags { PCI_DEV_FLAGS_NO_D3 = (__force pci_dev_flags_t) 2, /* Provide indication device is assigned by a Virtual Machine Manager */ PCI_DEV_FLAGS_ASSIGNED = (__force pci_dev_flags_t) 4, + /* Device causes system crash if in D3 during S3 sleep */ + PCI_DEV_FLAGS_NO_D3_DURING_SLEEP = (__force pci_dev_flags_t) 8, }; enum pci_irq_reroute_variant { |