add stmac read mac form eeprom

hc

2023-12-09 b22da3d8526a935aa31e086e63f60ff3246cb61c

 kernel/drivers/char/agp/generic.c
..
..
@@ -42,7 +42,6 @@
42
42
 #ifdef CONFIG_X86
43
43
 #include <asm/set_memory.h>
44
44
 #endif
45
-#include <asm/pgtable.h>
46
45
 #include "agp.h"
47
46
 
48
47
 __u32 *agp_gatt_table;
..
..
@@ -207,6 +206,7 @@
207
206
 /**
208
207
  *	agp_allocate_memory  -  allocate a group of pages of a certain type.
209
208
  *
209
+ *	@bridge: an agp_bridge_data struct allocated for the AGP host bridge.
210
210
  *	@page_count:	size_t argument of the number of pages
211
211
  *	@type:	u32 argument of the type of memory to be allocated.
212
212
  *
..
..
@@ -355,6 +355,7 @@
355
355
 /**
356
356
  *	agp_copy_info  -  copy bridge state information
357
357
  *
358
+ *	@bridge: an agp_bridge_data struct allocated for the AGP host bridge.
358
359
  *	@info:		agp_kern_info pointer.  The caller should insure that this pointer is valid.
359
360
  *
360
361
  *	This function copies information about the agp bridge device and the state of
..
..
@@ -850,7 +851,6 @@
850
851
 {
851
852
 	char *table;
852
853
 	char *table_end;
853
-	int size;
854
854
 	int page_order;
855
855
 	int num_entries;
856
856
 	int i;
..
..
@@ -864,25 +864,22 @@
864
864
 	table = NULL;
865
865
 	i = bridge->aperture_size_idx;
866
866
 	temp = bridge->current_size;
867
-	size = page_order = num_entries = 0;
867
+	page_order = num_entries = 0;
868
868
 
869
869
 	if (bridge->driver->size_type != FIXED_APER_SIZE) {
870
870
 		do {
871
871
 			switch (bridge->driver->size_type) {
872
872
 			case U8_APER_SIZE:
873
-				size = A_SIZE_8(temp)->size;
874
873
 				page_order =
875
874
 				    A_SIZE_8(temp)->page_order;
876
875
 				num_entries =
877
876
 				    A_SIZE_8(temp)->num_entries;
878
877
 				break;
879
878
 			case U16_APER_SIZE:
880
-				size = A_SIZE_16(temp)->size;
881
879
 				page_order = A_SIZE_16(temp)->page_order;
882
880
 				num_entries = A_SIZE_16(temp)->num_entries;
883
881
 				break;
884
882
 			case U32_APER_SIZE:
885
-				size = A_SIZE_32(temp)->size;
886
883
 				page_order = A_SIZE_32(temp)->page_order;
887
884
 				num_entries = A_SIZE_32(temp)->num_entries;
888
885
 				break;
..
..
@@ -890,7 +887,7 @@
890
887
 			case FIXED_APER_SIZE:
891
888
 			case LVL2_APER_SIZE:
892
889
 			default:
893
-				size = page_order = num_entries = 0;
890
+				page_order = num_entries = 0;
894
891
 				break;
895
892
 			}
896
893
 
..
..
@@ -920,7 +917,6 @@
920
917
 			}
921
918
 		} while (!table && (i < bridge->driver->num_aperture_sizes));
922
919
 	} else {
923
-		size = ((struct aper_size_info_fixed *) temp)->size;
924
920
 		page_order = ((struct aper_size_info_fixed *) temp)->page_order;
925
921
 		num_entries = ((struct aper_size_info_fixed *) temp)->num_entries;
926
922
 		table = alloc_gatt_pages(page_order);
..
..
@@ -944,7 +940,7 @@
944
940
 
945
941
 	bridge->gatt_table = (u32 __iomem *)table;
946
942
 #else
947
-	bridge->gatt_table = ioremap_nocache(virt_to_phys(table),
943
+	bridge->gatt_table = ioremap(virt_to_phys(table),
948
944
 					(PAGE_SIZE * (1 << page_order)));
949
945
 	bridge->driver->cache_flush();
950
946
 #endif
..
..
@@ -1282,6 +1278,7 @@
1282
1278
 /**
1283
1279
  * agp_enable  -  initialise the agp point-to-point connection.
1284
1280
  *
1281
+ * @bridge: an agp_bridge_data struct allocated for the AGP host bridge.
1285
1282
  * @mode:	agp mode register value to configure with.
1286
1283
  */
1287
1284
 void agp_enable(struct agp_bridge_data *bridge, u32 mode)
..
..
@@ -1311,8 +1308,7 @@
1311
1308
 
1312
1309
 void global_cache_flush(void)
1313
1310
 {
1314
-	if (on_each_cpu(ipi_handler, NULL, 1) != 0)
1315
-		panic(PFX "timed out waiting for the other CPUs!\n");
1311
+	on_each_cpu(ipi_handler, NULL, 1);
1316
1312
 }
1317
1313
 EXPORT_SYMBOL(global_cache_flush);
1318
1314