gmac get mac form eeprom

hc

2024-05-10 37f49e37ab4cb5d0bc4c60eb5c6d4dd57db767bb

 kernel/arch/m68k/sun3x/dvma.c
..
..
@@ -15,15 +15,14 @@
15
15
 #include <linux/init.h>
16
16
 #include <linux/bitops.h>
17
17
 #include <linux/mm.h>
18
-#include <linux/bootmem.h>
18
+#include <linux/memblock.h>
19
19
 #include <linux/vmalloc.h>
20
20
 
21
21
 #include <asm/sun3x.h>
22
22
 #include <asm/dvma.h>
23
23
 #include <asm/io.h>
24
24
 #include <asm/page.h>
25
-#include <asm/pgtable.h>
26
-#include <asm/pgalloc.h>
25
+#include <asm/tlbflush.h>
27
26
 
28
27
 /* IOMMU support */
29
28
 
..
..
@@ -80,6 +79,8 @@
80
79
 			       unsigned long vaddr, int len)
81
80
 {
82
81
 	pgd_t *pgd;
82
+	p4d_t *p4d;
83
+	pud_t *pud;
83
84
 	unsigned long end;
84
85
 	int ret = 0;
85
86
 
..
..
@@ -90,12 +91,14 @@
90
91
 
91
92
 	pr_debug("dvma: mapping kern %08lx to virt %08lx\n", kaddr, vaddr);
92
93
 	pgd = pgd_offset_k(vaddr);
94
+	p4d = p4d_offset(pgd, vaddr);
95
+	pud = pud_offset(p4d, vaddr);
93
96
 
94
97
 	do {
95
98
 		pmd_t *pmd;
96
99
 		unsigned long end2;
97
100
 
98
-		if((pmd = pmd_alloc(&init_mm, pgd, vaddr)) == NULL) {
101
+		if((pmd = pmd_alloc(&init_mm, pud, vaddr)) == NULL) {
99
102
 			ret = -ENOMEM;
100
103
 			goto out;
101
104
 		}
..
..
@@ -196,4 +199,3 @@
196
199
 	}
197
200
 
198
201
 }
199
-