diff options
| -rw-r--r-- | arch/Kconfig | 3 | ||||
| -rw-r--r-- | arch/sparc/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index 1aafb4efbb51..d789a89cb32c 100644 --- a/arch/Kconfig +++ b/arch/Kconfig | |||
| @@ -937,9 +937,6 @@ config STRICT_MODULE_RWX | |||
| 937 | and non-text memory will be made non-executable. This provides | 937 | and non-text memory will be made non-executable. This provides |
| 938 | protection against certain security exploits (e.g. writing to text) | 938 | protection against certain security exploits (e.g. writing to text) |
| 939 | 939 | ||
| 940 | config ARCH_WANT_RELAX_ORDER | ||
| 941 | bool | ||
| 942 | |||
| 943 | config ARCH_HAS_REFCOUNT | 940 | config ARCH_HAS_REFCOUNT |
| 944 | bool | 941 | bool |
| 945 | help | 942 | help |
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 0be3828752e5..4e83f950713e 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig | |||
| @@ -44,7 +44,6 @@ config SPARC | |||
| 44 | select ARCH_HAS_SG_CHAIN | 44 | select ARCH_HAS_SG_CHAIN |
| 45 | select CPU_NO_EFFICIENT_FFS | 45 | select CPU_NO_EFFICIENT_FFS |
| 46 | select LOCKDEP_SMALL if LOCKDEP | 46 | select LOCKDEP_SMALL if LOCKDEP |
| 47 | select ARCH_WANT_RELAX_ORDER | ||
| 48 | 47 | ||
| 49 | config SPARC32 | 48 | config SPARC32 |
| 50 | def_bool !64BIT | 49 | def_bool !64BIT |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c index 2c19070d2a0b..e8c1788aed1f 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | |||
| @@ -366,7 +366,7 @@ s32 ixgbe_start_hw_gen2(struct ixgbe_hw *hw) | |||
| 366 | } | 366 | } |
| 367 | IXGBE_WRITE_FLUSH(hw); | 367 | IXGBE_WRITE_FLUSH(hw); |
| 368 | 368 | ||
| 369 | #ifndef CONFIG_ARCH_WANT_RELAX_ORDER | 369 | #ifndef CONFIG_SPARC |
| 370 | /* Disable relaxed ordering */ | 370 | /* Disable relaxed ordering */ |
| 371 | for (i = 0; i < hw->mac.max_tx_queues; i++) { | 371 | for (i = 0; i < hw->mac.max_tx_queues; i++) { |
| 372 | u32 regval; | 372 | u32 regval; |
