diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-06 11:12:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-06 11:12:08 -0400 |
| commit | f84d9fa86820b3074a8c143444a6932c0c0fd019 (patch) | |
| tree | 5a255baa763c8d895ab3dc5feee03c288e0f0810 /arch/sparc/include | |
| parent | 82fa407da081d05323171577d86f62d77df17465 (diff) | |
| parent | 98e98eb6a8a179a444a30d903714fab356726155 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc updates from David Miller:
"Besides some cleanups the major thing here is supporting relaxed
ordering PCIe transactions on newer sparc64 machines, from Chris
Hyser"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc: fixing ident and beautifying code
sparc64: Enable setting "relaxed ordering" in IOMMU mappings
sparc64: Enable PCI IOMMU version 2 API
sparc: migrate exception table users off module.h and onto extable.h
Diffstat (limited to 'arch/sparc/include')
| -rw-r--r-- | arch/sparc/include/asm/hypervisor.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/hypervisor.h b/arch/sparc/include/asm/hypervisor.h index f5b6537306f0..666d5ba230d2 100644 --- a/arch/sparc/include/asm/hypervisor.h +++ b/arch/sparc/include/asm/hypervisor.h | |||
| @@ -1744,6 +1744,7 @@ unsigned long sun4v_vintr_set_target(unsigned long dev_handle, | |||
| 1744 | 1744 | ||
| 1745 | #define HV_PCI_MAP_ATTR_READ 0x01 | 1745 | #define HV_PCI_MAP_ATTR_READ 0x01 |
| 1746 | #define HV_PCI_MAP_ATTR_WRITE 0x02 | 1746 | #define HV_PCI_MAP_ATTR_WRITE 0x02 |
| 1747 | #define HV_PCI_MAP_ATTR_RELAXED_ORDER 0x04 | ||
| 1747 | 1748 | ||
| 1748 | #define HV_PCI_DEVICE_BUILD(b,d,f) \ | 1749 | #define HV_PCI_DEVICE_BUILD(b,d,f) \ |
| 1749 | ((((b) & 0xff) << 16) | \ | 1750 | ((((b) & 0xff) << 16) | \ |