From a46a1ad097419aeea7350987dd95230f50d90392 Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Fri, 15 Nov 2024 08:53:41 +0000
Subject: [PATCH] 固定GMAC1 网卡名为 eth3
---
kernel/arch/x86/kernel/cpu/mtrr/generic.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/kernel/arch/x86/kernel/cpu/mtrr/generic.c b/kernel/arch/x86/kernel/cpu/mtrr/generic.c
index a29997e..fc15869 100644
--- a/kernel/arch/x86/kernel/cpu/mtrr/generic.c
+++ b/kernel/arch/x86/kernel/cpu/mtrr/generic.c
@@ -450,13 +450,13 @@
{
unsigned long flags;
- local_irq_save(flags);
+ flags = hard_local_irq_save();
prepare_set();
pat_init();
post_set();
- local_irq_restore(flags);
+ hard_local_irq_restore(flags);
}
/* Grab all of the MTRR state for this CPU into *state */
@@ -797,7 +797,7 @@
unsigned long mask, count;
unsigned long flags;
- local_irq_save(flags);
+ flags = hard_local_irq_save();
prepare_set();
/* Actually set the state */
@@ -807,7 +807,7 @@
pat_init();
post_set();
- local_irq_restore(flags);
+ hard_local_irq_restore(flags);
/* Use the atomic bitops to update the global mask */
for (count = 0; count < sizeof(mask) * 8; ++count) {
@@ -836,7 +836,7 @@
vr = &mtrr_state.var_ranges[reg];
- local_irq_save(flags);
+ flags = hard_local_irq_save();
prepare_set();
if (size == 0) {
@@ -857,7 +857,7 @@
}
post_set();
- local_irq_restore(flags);
+ hard_local_irq_restore(flags);
}
int generic_validate_add_page(unsigned long base, unsigned long size,
--
Gitblit v1.6.2