diff options
| author | Tom Rini <trini@konsulko.com> | 2024-09-03 09:12:06 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-09-03 09:12:06 -0600 |
| commit | 2c832abc732c9f6696b5a441efe9a17483f30b8b (patch) | |
| tree | abb8ad74b6de71781e51a99544c007d73a6624b4 /arch/x86/include | |
| parent | 11beb9fe0fec534e1f50ef2a1ace924afebc392d (diff) | |
| parent | 49d8fe07f997439171387e9dba4e4561e7846d90 (diff) | |
Merge patch series "net: dwc_eth_qos: Add glue driver for Intel MAC"
Philip Oberfichtner <pro@denx.de> says:
This patch series implements the dwc_eth_qos glue driver for Intel SOCs.
Before doing that, a few general adaptions to the dwc_eth_qos.c main
driver are required. Most notably, the preparation for PCI based driver
instances, which do not necessarily use a device tree.
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/cpu.h | 5 | ||||
| -rw-r--r-- | arch/x86/include/asm/io.h | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/include/asm/cpu.h b/arch/x86/include/asm/cpu.h index 073f80b07f1..87e0c6f12b6 100644 --- a/arch/x86/include/asm/cpu.h +++ b/arch/x86/include/asm/cpu.h @@ -185,11 +185,6 @@ static inline int flag_is_changeable_p(uint32_t flag) } #endif -static inline void mfence(void) -{ - __asm__ __volatile__("mfence" : : : "memory"); -} - /** * cpu_enable_paging_pae() - Enable PAE-paging * diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h index c6d90eb794a..1390193f09c 100644 --- a/arch/x86/include/asm/io.h +++ b/arch/x86/include/asm/io.h @@ -240,6 +240,7 @@ static inline void sync(void) * have some advantages to use them instead of the simple one here. */ #define dmb() __asm__ __volatile__ ("" : : : "memory") +#define mb() __asm__ __volatile__ ("mfence" : : : "memory") #define __iormb() dmb() #define __iowmb() dmb() |