aboutsummaryrefslogtreecommitdiffstats
path: root/sources/linux-libc-headers-2.6.8-cleanup.patch
blob: 44461d1abf7741fa821bbbcf8f0c21dcac0e976e (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
2232
2233
2234
2235
2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
2289
2290
2291
2292
2293
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
2320
2321
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
2352
2353
2354
2355
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
2378
2379
2380
2381
2382
2383
2384
2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
2395
2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
2406
2407
2408
2409
2410
2411
2412
2413
2414
2415
2416
2417
2418
2419
2420
2421
2422
2423
2424
2425
2426
2427
2428
2429
2430
2431
2432
2433
2434
2435
2436
2437
2438
2439
2440
2441
2442
2443
2444
2445
2446
2447
2448
2449
2450
2451
2452
2453
2454
2455
2456
2457
2458
2459
2460
2461
2462
2463
2464
2465
2466
2467
2468
2469
2470
2471
2472
2473
2474
2475
2476
2477
2478
2479
2480
2481
2482
2483
2484
2485
2486
2487
2488
2489
2490
2491
2492
2493
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
2505
2506
2507
2508
2509
2510
2511
2512
2513
2514
2515
2516
2517
2518
2519
2520
2521
2522
2523
2524
2525
2526
2527
2528
2529
2530
2531
2532
2533
2534
2535
2536
2537
2538
2539
2540
2541
2542
2543
2544
2545
2546
2547
2548
2549
2550
2551
2552
2553
2554
2555
2556
2557
2558
2559
2560
2561
2562
2563
2564
2565
2566
2567
2568
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
2579
2580
2581
2582
2583
2584
2585
2586
2587
2588
2589
2590
2591
2592
2593
2594
2595
2596
2597
2598
2599
2600
2601
2602
2603
2604
2605
2606
2607
2608
2609
2610
2611
2612
2613
2614
2615
2616
2617
2618
2619
2620
2621
2622
2623
2624
2625
2626
2627
2628
2629
2630
2631
2632
2633
2634
2635
2636
2637
2638
2639
2640
2641
2642
2643
2644
2645
2646
2647
2648
2649
2650
2651
2652
2653
2654
2655
2656
2657
2658
2659
2660
2661
2662
2663
2664
2665
2666
2667
2668
2669
2670
2671
2672
2673
2674
2675
2676
2677
2678
2679
2680
2681
2682
2683
2684
2685
2686
2687
2688
2689
2690
2691
2692
2693
2694
2695
2696
2697
2698
2699
2700
2701
2702
2703
2704
2705
2706
2707
2708
2709
2710
2711
2712
2713
2714
2715
2716
2717
2718
2719
2720
2721
2722
2723
2724
2725
2726
2727
2728
2729
2730
2731
2732
2733
2734
2735
2736
2737
2738
2739
2740
2741
2742
2743
2744
2745
2746
2747
2748
2749
2750
2751
2752
2753
2754
2755
2756
2757
2758
2759
2760
2761
2762
2763
2764
2765
2766
2767
2768
2769
2770
2771
2772
2773
2774
2775
2776
2777
2778
2779
2780
2781
2782
2783
2784
2785
2786
2787
2788
2789
2790
2791
2792
2793
2794
2795
2796
2797
2798
2799
2800
2801
2802
2803
2804
2805
2806
2807
2808
2809
2810
2811
2812
2813
2814
2815
2816
2817
2818
2819
2820
2821
2822
2823
2824
2825
2826
2827
2828
2829
2830
2831
2832
2833
2834
2835
2836
2837
2838
2839
2840
2841
2842
2843
2844
2845
2846
2847
2848
2849
2850
2851
2852
2853
2854
2855
2856
2857
2858
2859
2860
2861
2862
2863
2864
2865
2866
2867
2868
2869
2870
2871
2872
2873
2874
2875
2876
2877
2878
2879
2880
2881
2882
2883
2884
2885
2886
2887
2888
2889
2890
2891
2892
2893
2894
2895
2896
2897
2898
2899
2900
2901
2902
2903
2904
2905
2906
2907
2908
2909
2910
2911
2912
2913
2914
2915
2916
2917
2918
2919
2920
2921
2922
2923
2924
2925
2926
2927
2928
2929
2930
2931
2932
2933
2934
2935
2936
2937
2938
2939
2940
2941
2942
2943
2944
2945
2946
2947
2948
2949
2950
2951
2952
2953
2954
2955
2956
2957
2958
2959
2960
2961
2962
2963
2964
2965
2966
2967
2968
2969
2970
2971
2972
2973
2974
2975
2976
2977
2978
2979
2980
2981
2982
2983
2984
2985
2986
2987
2988
2989
2990
2991
2992
2993
2994
2995
2996
2997
2998
2999
3000
3001
3002
3003
3004
3005
3006
3007
3008
3009
3010
3011
3012
3013
3014
3015
3016
3017
3018
3019
3020
3021
3022
3023
3024
3025
3026
3027
3028
3029
3030
3031
3032
3033
3034
3035
3036
3037
3038
3039
3040
3041
3042
3043
3044
3045
3046
3047
3048
3049
3050
3051
3052
3053
3054
3055
3056
3057
3058
3059
3060
3061
3062
3063
3064
3065
3066
3067
3068
3069
3070
3071
3072
3073
3074
3075
3076
3077
3078
3079
3080
3081
3082
3083
3084
3085
3086
3087
3088
3089
3090
3091
3092
3093
3094
3095
3096
3097
3098
3099
3100
3101
3102
3103
3104
3105
3106
3107
3108
3109
3110
3111
3112
3113
3114
3115
3116
3117
3118
3119
3120
3121
3122
3123
3124
3125
3126
3127
3128
3129
3130
3131
3132
3133
3134
3135
3136
3137
3138
3139
3140
3141
3142
3143
3144
3145
3146
3147
3148
3149
3150
3151
3152
3153
3154
3155
3156
3157
3158
3159
3160
3161
3162
3163
3164
3165
3166
3167
3168
3169
3170
3171
3172
3173
3174
3175
3176
3177
3178
3179
3180
3181
3182
3183
3184
3185
3186
3187
3188
3189
3190
3191
3192
3193
3194
3195
3196
3197
3198
3199
3200
3201
3202
3203
3204
3205
3206
3207
3208
3209
3210
3211
3212
3213
3214
3215
3216
3217
3218
3219
3220
3221
3222
3223
3224
3225
3226
3227
3228
3229
3230
3231
3232
3233
3234
3235
3236
3237
3238
3239
3240
3241
3242
3243
3244
3245
3246
3247
3248
3249
3250
3251
3252
3253
3254
3255
3256
3257
3258
3259
3260
3261
3262
3263
3264
3265
3266
3267
3268
3269
3270
3271
3272
3273
3274
3275
3276
3277
3278
3279
3280
3281
3282
3283
3284
3285
3286
3287
3288
3289
3290
3291
3292
3293
3294
3295
3296
3297
3298
3299
3300
3301
3302
3303
3304
3305
3306
3307
3308
3309
3310
3311
3312
3313
3314
3315
3316
3317
3318
3319
3320
3321
3322
3323
3324
3325
3326
3327
3328
3329
3330
3331
3332
3333
3334
3335
3336
3337
3338
3339
3340
3341
3342
3343
3344
3345
3346
3347
3348
3349
3350
3351
3352
3353
3354
3355
3356
3357
3358
3359
3360
3361
3362
3363
3364
3365
3366
3367
3368
3369
3370
3371
3372
3373
3374
3375
3376
3377
3378
3379
3380
3381
3382
3383
3384
3385
3386
3387
3388
3389
3390
3391
3392
3393
3394
3395
3396
3397
3398
3399
3400
3401
3402
3403
3404
3405
3406
3407
3408
3409
3410
3411
3412
3413
3414
3415
3416
3417
3418
3419
3420
3421
3422
3423
3424
3425
3426
3427
3428
3429
3430
3431
3432
3433
3434
3435
3436
3437
3438
3439
3440
3441
3442
3443
3444
3445
3446
3447
3448
3449
3450
3451
3452
3453
3454
3455
3456
3457
3458
3459
3460
3461
3462
3463
3464
3465
3466
3467
3468
3469
3470
3471
3472
3473
3474
3475
3476
3477
3478
3479
3480
3481
3482
3483
3484
3485
3486
3487
3488
3489
3490
3491
3492
3493
3494
3495
3496
3497
3498
3499
3500
3501
3502
3503
3504
3505
3506
3507
3508
3509
3510
3511
3512
3513
3514
3515
3516
3517
3518
3519
3520
3521
3522
3523
3524
3525
3526
3527
3528
3529
3530
3531
3532
3533
3534
3535
3536
3537
3538
3539
3540
3541
3542
3543
3544
3545
3546
3547
3548
3549
3550
3551
3552
3553
3554
3555
3556
3557
3558
3559
3560
3561
3562
3563
3564
3565
3566
3567
3568
3569
3570
3571
3572
3573
3574
3575
3576
3577
3578
3579
3580
3581
3582
3583
3584
3585
3586
3587
3588
3589
3590
3591
3592
3593
3594
3595
3596
3597
3598
3599
3600
3601
3602
3603
3604
3605
3606
3607
3608
3609
3610
3611
3612
3613
3614
3615
3616
3617
3618
3619
3620
3621
3622
3623
3624
3625
3626
3627
3628
3629
3630
3631
3632
3633
3634
3635
3636
3637
3638
3639
3640
3641
3642
3643
3644
3645
3646
3647
3648
3649
3650
3651
3652
3653
3654
3655
3656
3657
3658
3659
3660
3661
3662
3663
3664
3665
3666
3667
3668
3669
3670
3671
3672
3673
3674
3675
3676
3677
3678
3679
3680
3681
3682
3683
3684
3685
3686
3687
3688
3689
3690
3691
3692
3693
3694
3695
3696
3697
3698
3699
3700
3701
3702
3703
3704
3705
3706
3707
3708
3709
3710
3711
3712
3713
3714
3715
3716
3717
3718
3719
3720
3721
3722
3723
3724
3725
3726
3727
3728
3729
3730
3731
3732
3733
3734
3735
3736
3737
3738
3739
3740
3741
3742
3743
3744
3745
3746
3747
3748
3749
3750
3751
3752
3753
3754
3755
3756
3757
3758
3759
3760
3761
3762
3763
3764
3765
3766
3767
3768
3769
3770
3771
3772
3773
3774
3775
3776
3777
3778
3779
3780
3781
3782
3783
3784
3785
3786
3787
3788
3789
3790
3791
3792
3793
3794
3795
3796
3797
3798
3799
3800
3801
3802
3803
3804
3805
3806
3807
3808
3809
3810
3811
3812
3813
3814
3815
3816
3817
3818
3819
3820
3821
3822
3823
3824
3825
3826
3827
3828
3829
3830
3831
3832
3833
3834
3835
3836
3837
3838
3839
3840
3841
3842
3843
3844
3845
3846
3847
3848
3849
3850
3851
3852
3853
3854
3855
3856
3857
3858
3859
3860
3861
3862
3863
3864
3865
3866
3867
3868
3869
3870
3871
3872
3873
3874
3875
3876
3877
3878
3879
3880
3881
3882
3883
3884
3885
3886
3887
3888
3889
3890
3891
3892
3893
3894
3895
3896
3897
3898
3899
3900
3901
3902
3903
3904
3905
3906
3907
3908
3909
3910
3911
3912
3913
3914
3915
3916
3917
3918
3919
3920
3921
3922
3923
3924
3925
3926
3927
3928
3929
3930
3931
3932
3933
3934
3935
3936
3937
3938
3939
3940
3941
3942
3943
3944
3945
3946
3947
3948
3949
3950
3951
3952
3953
3954
3955
3956
3957
3958
3959
3960
3961
3962
3963
3964
3965
3966
3967
3968
3969
3970
3971
3972
3973
3974
3975
3976
3977
3978
3979
3980
3981
3982
3983
3984
3985
3986
3987
3988
3989
3990
3991
3992
3993
3994
3995
3996
3997
3998
3999
4000
4001
4002
4003
4004
4005
4006
4007
4008
4009
4010
4011
4012
4013
4014
4015
4016
4017
4018
4019
4020
4021
4022
4023
4024
4025
4026
4027
4028
4029
4030
4031
4032
4033
4034
4035
4036
4037
4038
4039
4040
4041
4042
4043
4044
4045
4046
4047
4048
4049
4050
4051
4052
4053
4054
4055
4056
4057
4058
4059
4060
4061
4062
4063
4064
4065
4066
4067
4068
4069
4070
4071
4072
4073
4074
4075
4076
4077
4078
4079
4080
4081
4082
4083
4084
4085
4086
4087
4088
4089
4090
4091
4092
4093
4094
4095
4096
4097
4098
4099
4100
4101
4102
4103
4104
4105
4106
4107
4108
4109
4110
4111
4112
4113
4114
4115
4116
4117
4118
4119
4120
4121
4122
4123
4124
4125
4126
4127
4128
4129
4130
4131
4132
4133
4134
4135
4136
4137
4138
4139
4140
4141
4142
4143
4144
4145
4146
4147
4148
4149
4150
4151
4152
4153
4154
4155
4156
4157
4158
4159
4160
4161
4162
4163
4164
4165
4166
4167
4168
4169
4170
4171
4172
4173
4174
4175
4176
4177
4178
4179
4180
4181
4182
4183
4184
4185
4186
4187
4188
4189
4190
4191
4192
4193
4194
4195
4196
4197
4198
4199
4200
4201
4202
4203
4204
4205
4206
4207
4208
4209
4210
4211
4212
4213
4214
4215
4216
4217
4218
4219
4220
4221
4222
4223
4224
4225
4226
4227
4228
4229
4230
4231
4232
4233
4234
4235
4236
4237
4238
4239
4240
4241
4242
4243
4244
4245
4246
4247
4248
4249
4250
4251
4252
4253
4254
4255
4256
4257
4258
4259
4260
4261
4262
4263
4264
4265
4266
4267
4268
4269
4270
4271
4272
4273
4274
4275
4276
4277
4278
4279
4280
4281
4282
4283
4284
4285
4286
4287
4288
4289
4290
4291
4292
4293
4294
4295
4296
4297
4298
4299
4300
4301
4302
4303
4304
4305
4306
4307
4308
4309
4310
4311
4312
4313
4314
4315
4316
4317
4318
4319
4320
4321
4322
4323
4324
4325
4326
4327
4328
4329
4330
4331
4332
4333
4334
4335
4336
4337
4338
4339
4340
4341
4342
4343
4344
4345
4346
4347
4348
4349
4350
4351
4352
4353
4354
4355
4356
4357
4358
4359
4360
4361
4362
4363
4364
4365
4366
4367
4368
4369
4370
4371
4372
4373
4374
4375
4376
4377
4378
4379
4380
4381
4382
4383
4384
4385
4386
4387
4388
4389
4390
4391
4392
4393
4394
4395
4396
4397
4398
4399
4400
4401
4402
4403
4404
4405
4406
4407
4408
4409
4410
4411
4412
4413
4414
4415
4416
4417
4418
4419
4420
4421
4422
4423
4424
4425
4426
4427
4428
4429
4430
4431
4432
4433
4434
4435
4436
4437
4438
4439
4440
4441
4442
4443
4444
4445
4446
4447
4448
4449
4450
4451
4452
4453
4454
4455
4456
4457
4458
4459
4460
4461
4462
4463
4464
4465
4466
4467
4468
4469
4470
4471
4472
4473
4474
4475
4476
4477
4478
4479
4480
4481
4482
4483
4484
4485
4486
4487
4488
4489
4490
4491
4492
4493
4494
4495
4496
4497
4498
4499
4500
4501
4502
4503
4504
4505
4506
4507
4508
4509
4510
4511
4512
4513
4514
4515
4516
4517
4518
4519
4520
4521
4522
4523
4524
4525
4526
4527
4528
4529
4530
4531
4532
4533
4534
4535
4536
4537
4538
4539
4540
4541
4542
4543
4544
4545
4546
4547
4548
4549
4550
4551
4552
4553
4554
4555
4556
4557
4558
4559
4560
4561
4562
4563
4564
4565
4566
4567
4568
4569
4570
4571
4572
4573
4574
4575
4576
4577
4578
4579
4580
4581
4582
4583
4584
4585
4586
4587
4588
4589
4590
4591
4592
4593
4594
4595
4596
4597
4598
4599
4600
4601
4602
4603
4604
4605
4606
4607
4608
4609
4610
4611
4612
4613
4614
4615
4616
4617
4618
4619
4620
4621
4622
4623
4624
4625
4626
4627
4628
4629
4630
4631
4632
4633
4634
4635
4636
4637
4638
4639
4640
4641
4642
4643
4644
4645
4646
4647
4648
4649
4650
4651
4652
4653
4654
4655
4656
4657
4658
4659
4660
4661
4662
4663
4664
4665
4666
4667
4668
4669
4670
4671
4672
4673
4674
4675
4676
4677
4678
4679
4680
4681
4682
4683
4684
4685
4686
4687
4688
4689
4690
4691
4692
4693
4694
4695
4696
4697
4698
4699
4700
4701
4702
4703
4704
4705
4706
4707
4708
4709
4710
4711
4712
4713
4714
4715
4716
4717
4718
4719
4720
4721
4722
4723
4724
4725
4726
4727
4728
4729
4730
4731
4732
4733
4734
4735
4736
4737
4738
4739
4740
4741
4742
4743
4744
4745
4746
4747
4748
4749
4750
4751
4752
4753
4754
4755
4756
4757
4758
4759
4760
4761
4762
4763
4764
4765
4766
4767
4768
4769
4770
4771
4772
4773
4774
4775
4776
4777
4778
4779
4780
4781
4782
4783
4784
4785
4786
4787
4788
4789
4790
4791
4792
4793
4794
4795
4796
4797
4798
4799
4800
4801
4802
4803
4804
4805
4806
4807
4808
4809
4810
4811
4812
4813
4814
4815
4816
4817
4818
4819
4820
4821
4822
4823
4824
4825
4826
4827
4828
4829
4830
4831
4832
4833
4834
4835
4836
4837
4838
4839
4840
4841
4842
4843
4844
4845
4846
4847
4848
4849
4850
4851
4852
4853
4854
4855
4856
4857
4858
4859
4860
4861
4862
4863
4864
4865
4866
4867
4868
4869
4870
4871
4872
4873
4874
4875
4876
4877
4878
4879
4880
4881
4882
4883
4884
4885
4886
4887
4888
4889
4890
4891
4892
4893
4894
4895
4896
4897
4898
4899
4900
4901
4902
4903
4904
4905
4906
4907
4908
4909
4910
4911
4912
4913
4914
4915
4916
4917
4918
4919
4920
4921
4922
4923
4924
4925
4926
4927
4928
4929
4930
4931
4932
4933
4934
4935
4936
4937
4938
4939
4940
4941
4942
4943
4944
4945
4946
4947
4948
4949
4950
4951
4952
4953
4954
4955
4956
4957
4958
4959
4960
4961
4962
4963
4964
4965
4966
4967
4968
4969
4970
4971
4972
4973
4974
4975
4976
4977
4978
4979
4980
4981
4982
4983
4984
4985
4986
4987
4988
4989
4990
4991
4992
4993
4994
4995
4996
4997
4998
4999
5000
5001
5002
5003
5004
5005
5006
5007
5008
5009
5010
5011
5012
5013
5014
5015
5016
5017
5018
5019
5020
5021
5022
5023
5024
5025
5026
5027
5028
5029
5030
5031
5032
5033
5034
5035
5036
5037
5038
5039
5040
5041
5042
5043
5044
5045
5046
5047
5048
5049
5050
5051
5052
5053
5054
5055
5056
5057
5058
5059
5060
5061
5062
5063
5064
5065
5066
5067
5068
5069
5070
5071
5072
5073
5074
5075
5076
5077
5078
5079
5080
5081
5082
5083
5084
5085
5086
5087
5088
5089
5090
5091
5092
5093
5094
5095
5096
5097
5098
5099
5100
5101
5102
5103
5104
5105
5106
5107
5108
5109
5110
5111
5112
5113
5114
5115
5116
5117
5118
5119
5120
5121
5122
5123
5124
5125
5126
5127
5128
5129
5130
5131
5132
5133
5134
5135
5136
5137
5138
5139
5140
5141
5142
5143
5144
5145
5146
5147
5148
5149
5150
5151
5152
5153
5154
5155
5156
5157
5158
5159
5160
5161
5162
5163
5164
5165
5166
5167
5168
5169
5170
5171
5172
5173
5174
5175
5176
5177
5178
5179
5180
5181
5182
5183
5184
5185
5186
5187
5188
5189
5190
5191
5192
5193
5194
5195
5196
5197
5198
5199
5200
5201
5202
5203
5204
5205
5206
5207
5208
5209
5210
5211
5212
5213
5214
5215
5216
5217
5218
5219
5220
5221
5222
5223
5224
5225
5226
5227
5228
5229
5230
5231
5232
5233
5234
5235
5236
5237
5238
5239
5240
5241
5242
5243
5244
5245
5246
5247
5248
5249
5250
5251
5252
5253
5254
5255
5256
5257
5258
5259
5260
5261
5262
5263
5264
5265
5266
5267
5268
5269
5270
5271
5272
5273
5274
5275
5276
5277
5278
5279
5280
5281
5282
5283
5284
5285
5286
5287
5288
5289
5290
5291
5292
5293
5294
5295
5296
5297
5298
5299
5300
5301
5302
5303
5304
5305
5306
5307
5308
5309
5310
5311
5312
5313
5314
5315
5316
5317
5318
5319
5320
5321
5322
5323
5324
5325
5326
5327
5328
5329
5330
5331
5332
5333
5334
5335
5336
5337
5338
5339
5340
5341
5342
5343
5344
5345
5346
5347
5348
5349
5350
5351
5352
5353
5354
5355
5356
5357
5358
5359
5360
5361
5362
5363
5364
5365
5366
5367
5368
5369
5370
5371
5372
5373
5374
5375
5376
5377
5378
5379
5380
5381
5382
5383
5384
5385
5386
5387
5388
5389
5390
5391
5392
5393
5394
5395
5396
5397
5398
5399
5400
5401
5402
5403
5404
5405
5406
5407
5408
5409
5410
5411
5412
5413
5414
5415
5416
5417
5418
5419
5420
5421
5422
5423
5424
5425
5426
5427
5428
5429
5430
5431
5432
5433
5434
5435
5436
5437
5438
5439
5440
5441
5442
5443
5444
5445
5446
5447
5448
5449
5450
5451
5452
5453
5454
5455
5456
5457
5458
5459
5460
5461
5462
5463
5464
5465
5466
5467
5468
5469
5470
5471
5472
5473
5474
5475
5476
5477
5478
5479
5480
5481
5482
5483
5484
5485
5486
5487
5488
5489
5490
5491
5492
5493
5494
5495
5496
5497
5498
5499
5500
5501
5502
5503
5504
5505
5506
5507
5508
5509
5510
5511
5512
5513
5514
5515
5516
5517
5518
5519
5520
5521
5522
5523
5524
5525
5526
5527
5528
5529
5530
5531
5532
5533
5534
5535
5536
5537
5538
5539
5540
5541
5542
5543
5544
5545
5546
5547
5548
5549
5550
5551
5552
5553
5554
5555
5556
5557
5558
5559
5560
5561
5562
5563
5564
5565
5566
5567
5568
5569
5570
5571
5572
5573
5574
5575
5576
5577
5578
5579
5580
5581
5582
5583
5584
5585
5586
5587
5588
5589
5590
5591
5592
5593
5594
5595
5596
5597
5598
5599
5600
5601
5602
5603
5604
5605
5606
5607
5608
5609
5610
5611
5612
5613
5614
5615
5616
5617
5618
5619
5620
5621
5622
5623
5624
5625
5626
5627
5628
5629
5630
5631
5632
5633
5634
5635
5636
5637
5638
5639
5640
5641
5642
5643
5644
5645
5646
5647
5648
5649
5650
5651
5652
5653
5654
5655
5656
5657
5658
5659
5660
5661
5662
5663
5664
5665
5666
5667
5668
5669
5670
5671
5672
5673
5674
5675
5676
5677
5678
5679
5680
5681
5682
5683
5684
5685
5686
5687
5688
5689
5690
5691
5692
5693
5694
5695
5696
5697
5698
5699
5700
5701
5702
5703
5704
5705
5706
5707
5708
5709
5710
5711
5712
5713
5714
5715
5716
5717
5718
5719
5720
5721
5722
5723
5724
5725
5726
5727
5728
5729
5730
5731
5732
5733
5734
5735
5736
5737
5738
5739
5740
5741
5742
5743
5744
5745
5746
5747
5748
5749
5750
5751
5752
5753
5754
5755
5756
5757
5758
5759
5760
5761
5762
5763
5764
5765
5766
5767
5768
5769
5770
5771
5772
5773
5774
5775
5776
5777
5778
5779
5780
5781
5782
5783
5784
5785
5786
5787
5788
5789
5790
5791
5792
5793
5794
5795
5796
5797
5798
5799
5800
5801
5802
5803
5804
5805
5806
5807
5808
5809
5810
5811
5812
5813
5814
5815
5816
5817
5818
5819
5820
5821
5822
5823
5824
5825
5826
5827
5828
5829
5830
5831
5832
5833
5834
5835
5836
5837
5838
5839
5840
5841
5842
5843
5844
5845
5846
5847
5848
5849
5850
5851
5852
5853
5854
5855
5856
5857
5858
5859
5860
5861
5862
5863
5864
5865
5866
5867
5868
5869
5870
5871
5872
5873
5874
5875
5876
5877
5878
5879
5880
5881
5882
5883
5884
5885
5886
5887
5888
5889
5890
5891
5892
5893
5894
5895
5896
5897
5898
5899
5900
5901
5902
5903
5904
5905
5906
5907
5908
5909
5910
5911
5912
5913
5914
5915
5916
5917
5918
5919
5920
5921
5922
5923
5924
5925
5926
5927
5928
5929
5930
5931
5932
5933
5934
5935
5936
5937
5938
5939
5940
5941
5942
5943
5944
5945
5946
5947
5948
5949
5950
5951
5952
5953
5954
5955
5956
5957
5958
5959
5960
5961
5962
5963
5964
5965
5966
5967
5968
5969
5970
5971
5972
5973
5974
5975
5976
5977
5978
5979
5980
5981
5982
5983
5984
5985
5986
5987
5988
5989
5990
5991
5992
5993
5994
5995
5996
5997
5998
5999
6000
6001
6002
6003
6004
6005
6006
6007
6008
6009
6010
6011
6012
6013
6014
6015
6016
6017
6018
6019
6020
6021
6022
6023
6024
6025
6026
6027
6028
6029
6030
6031
6032
6033
6034
6035
6036
6037
6038
6039
6040
6041
6042
6043
6044
6045
6046
6047
6048
6049
6050
6051
6052
6053
6054
6055
6056
6057
6058
6059
6060
6061
6062
6063
6064
6065
6066
6067
6068
6069
6070
6071
6072
6073
6074
6075
6076
6077
6078
6079
6080
6081
6082
6083
6084
6085
6086
6087
6088
6089
6090
6091
6092
6093
6094
6095
6096
6097
6098
6099
6100
6101
6102
6103
6104
6105
6106
6107
6108
6109
6110
6111
6112
6113
6114
6115
6116
6117
6118
6119
6120
6121
6122
6123
6124
6125
6126
6127
6128
6129
6130
6131
6132
6133
6134
6135
6136
6137
6138
6139
6140
6141
6142
6143
6144
6145
6146
6147
6148
6149
6150
6151
6152
6153
6154
6155
6156
6157
6158
6159
6160
6161
6162
6163
6164
6165
6166
6167
6168
6169
6170
6171
6172
6173
6174
6175
6176
6177
6178
6179
6180
6181
6182
6183
6184
6185
6186
6187
6188
6189
6190
6191
6192
6193
6194
6195
6196
6197
6198
6199
6200
6201
6202
6203
6204
6205
6206
6207
6208
6209
6210
6211
6212
6213
6214
6215
6216
6217
6218
6219
6220
6221
6222
6223
6224
6225
6226
6227
6228
6229
6230
6231
6232
6233
6234
6235
6236
6237
6238
6239
6240
6241
6242
6243
6244
6245
6246
6247
6248
6249
6250
6251
6252
6253
6254
6255
6256
6257
6258
6259
6260
6261
6262
6263
6264
6265
6266
6267
6268
6269
6270
6271
6272
6273
6274
6275
6276
6277
6278
6279
6280
6281
6282
6283
6284
6285
6286
6287
6288
6289
6290
6291
6292
6293
6294
6295
6296
6297
6298
6299
6300
6301
6302
6303
6304
6305
6306
6307
6308
6309
6310
6311
6312
6313
6314
6315
6316
6317
6318
6319
6320
6321
6322
6323
6324
6325
6326
6327
6328
6329
6330
6331
6332
6333
6334
6335
6336
6337
6338
6339
6340
6341
6342
6343
6344
6345
6346
6347
6348
6349
6350
6351
6352
6353
6354
6355
6356
6357
6358
6359
6360
6361
6362
6363
6364
6365
6366
6367
6368
6369
6370
6371
6372
6373
6374
6375
6376
6377
6378
6379
6380
6381
6382
6383
6384
6385
6386
6387
6388
6389
6390
6391
6392
6393
6394
6395
6396
6397
6398
6399
6400
6401
6402
6403
6404
6405
6406
6407
6408
6409
6410
6411
6412
6413
6414
6415
6416
6417
6418
6419
6420
6421
6422
6423
6424
6425
6426
6427
6428
6429
6430
6431
6432
6433
6434
6435
6436
6437
6438
6439
6440
6441
6442
6443
6444
6445
6446
6447
6448
6449
6450
6451
6452
6453
6454
6455
6456
6457
6458
6459
6460
6461
6462
6463
6464
6465
6466
6467
6468
6469
6470
6471
6472
6473
6474
6475
6476
6477
6478
6479
6480
6481
6482
6483
6484
6485
6486
6487
6488
6489
6490
6491
6492
6493
6494
6495
6496
6497
6498
6499
6500
6501
6502
6503
6504
6505
6506
6507
6508
6509
6510
6511
6512
6513
6514
6515
6516
6517
6518
6519
6520
6521
6522
6523
6524
6525
6526
6527
6528
6529
6530
6531
6532
6533
6534
6535
6536
6537
6538
6539
6540
6541
6542
6543
6544
6545
6546
6547
6548
6549
6550
6551
6552
6553
6554
6555
6556
6557
6558
6559
6560
6561
6562
6563
6564
6565
6566
6567
6568
6569
6570
6571
6572
6573
6574
6575
6576
6577
6578
6579
6580
6581
6582
6583
6584
6585
6586
6587
6588
6589
6590
6591
6592
6593
6594
6595
6596
6597
6598
6599
6600
6601
6602
6603
6604
6605
6606
6607
6608
6609
6610
6611
6612
6613
6614
6615
6616
6617
6618
6619
6620
6621
6622
6623
6624
6625
6626
6627
6628
6629
6630
6631
6632
6633
6634
6635
6636
6637
6638
6639
6640
6641
6642
6643
6644
6645
6646
6647
6648
6649
6650
6651
6652
6653
6654
6655
6656
6657
6658
6659
6660
6661
6662
6663
6664
6665
6666
6667
6668
6669
6670
6671
6672
6673
6674
6675
6676
6677
6678
6679
6680
6681
6682
6683
6684
6685
6686
6687
6688
6689
6690
6691
6692
6693
6694
6695
6696
6697
6698
6699
6700
6701
6702
6703
6704
6705
6706
6707
6708
6709
6710
6711
6712
6713
6714
6715
6716
6717
6718
6719
6720
6721
6722
6723
6724
6725
6726
6727
6728
6729
6730
6731
6732
6733
6734
6735
6736
6737
6738
6739
6740
6741
6742
6743
6744
6745
6746
6747
6748
6749
6750
6751
6752
6753
6754
6755
6756
6757
6758
6759
6760
6761
6762
6763
6764
6765
6766
6767
6768
6769
6770
6771
6772
6773
6774
6775
6776
6777
6778
6779
6780
6781
6782
6783
6784
6785
6786
6787
6788
6789
6790
6791
6792
6793
6794
6795
6796
6797
6798
6799
6800
6801
6802
6803
6804
6805
6806
6807
6808
6809
6810
6811
6812
6813
6814
6815
6816
6817
6818
6819
6820
6821
6822
6823
6824
6825
6826
6827
6828
6829
6830
6831
6832
6833
6834
6835
6836
6837
6838
6839
6840
6841
6842
6843
6844
6845
6846
6847
6848
6849
6850
6851
6852
6853
6854
6855
6856
6857
6858
6859
6860
6861
6862
6863
6864
6865
6866
6867
6868
6869
6870
6871
6872
6873
6874
6875
6876
6877
6878
6879
6880
6881
6882
6883
6884
6885
6886
6887
6888
6889
6890
6891
6892
6893
6894
6895
6896
6897
6898
6899
6900
6901
6902
6903
6904
6905
6906
6907
6908
6909
6910
6911
6912
6913
6914
6915
6916
6917
6918
6919
6920
6921
6922
6923
6924
6925
6926
6927
6928
6929
6930
6931
6932
6933
6934
6935
6936
6937
6938
6939
6940
6941
6942
6943
6944
6945
6946
6947
6948
6949
6950
6951
6952
6953
6954
6955
6956
6957
6958
6959
6960
6961
6962
6963
6964
6965
6966
6967
6968
6969
6970
6971
6972
6973
6974
6975
6976
6977
6978
6979
6980
6981
6982
6983
6984
6985
6986
6987
6988
6989
6990
6991
6992
6993
6994
6995
6996
6997
6998
6999
7000
7001
7002
7003
7004
7005
7006
7007
7008
7009
7010
7011
7012
7013
7014
7015
7016
7017
7018
7019
7020
7021
7022
7023
7024
7025
7026
7027
7028
7029
7030
7031
7032
7033
7034
7035
7036
7037
7038
7039
7040
7041
7042
7043
7044
7045
7046
7047
7048
7049
7050
7051
7052
7053
7054
7055
7056
7057
7058
7059
7060
7061
7062
7063
7064
7065
7066
7067
7068
7069
7070
7071
7072
7073
7074
7075
7076
7077
7078
7079
7080
7081
7082
7083
7084
7085
7086
7087
7088
7089
7090
7091
7092
7093
7094
7095
7096
7097
7098
7099
7100
7101
7102
7103
7104
7105
7106
7107
7108
7109
7110
7111
7112
7113
7114
7115
7116
7117
7118
7119
7120
7121
7122
7123
7124
7125
7126
7127
7128
7129
7130
7131
7132
7133
7134
7135
7136
7137
7138
7139
7140
7141
7142
7143
7144
7145
7146
7147
7148
7149
7150
7151
7152
7153
7154
7155
7156
7157
7158
7159
7160
7161
7162
7163
7164
7165
7166
7167
7168
7169
7170
7171
7172
7173
7174
7175
7176
7177
7178
7179
7180
7181
7182
7183
7184
7185
7186
7187
7188
7189
7190
7191
7192
7193
7194
7195
7196
7197
7198
7199
7200
7201
7202
7203
7204
7205
7206
7207
7208
7209
7210
7211
7212
7213
7214
7215
7216
7217
7218
7219
7220
7221
7222
7223
7224
7225
7226
7227
7228
7229
7230
7231
7232
7233
7234
7235
7236
7237
7238
7239
7240
7241
7242
7243
7244
7245
7246
7247
7248
7249
7250
7251
7252
7253
7254
7255
7256
7257
7258
7259
7260
7261
7262
7263
7264
7265
7266
7267
7268
7269
7270
7271
7272
7273
7274
7275
7276
7277
7278
7279
7280
7281
7282
7283
7284
7285
7286
7287
7288
7289
7290
7291
7292
7293
7294
7295
7296
7297
7298
7299
7300
7301
7302
7303
7304
7305
7306
7307
7308
7309
7310
7311
7312
7313
7314
7315
7316
7317
7318
7319
7320
7321
7322
7323
7324
7325
7326
7327
7328
7329
7330
7331
7332
7333
7334
7335
7336
7337
7338
7339
7340
7341
7342
7343
7344
7345
7346
7347
7348
7349
7350
7351
7352
7353
7354
7355
7356
7357
7358
7359
7360
7361
7362
7363
7364
7365
7366
7367
7368
7369
7370
7371
7372
7373
7374
7375
7376
7377
7378
7379
7380
7381
7382
7383
7384
7385
7386
7387
7388
7389
7390
7391
7392
7393
7394
7395
7396
7397
7398
7399
7400
7401
7402
7403
7404
7405
7406
7407
7408
7409
7410
7411
7412
7413
7414
7415
7416
7417
7418
7419
7420
7421
7422
7423
7424
7425
7426
7427
7428
7429
7430
7431
7432
7433
7434
7435
7436
7437
7438
7439
7440
7441
7442
7443
7444
7445
7446
7447
7448
7449
7450
7451
7452
7453
7454
7455
7456
7457
7458
7459
7460
7461
7462
7463
7464
7465
7466
7467
7468
7469
7470
7471
7472
7473
7474
7475
7476
7477
7478
7479
7480
7481
7482
7483
7484
7485
7486
7487
7488
7489
7490
7491
7492
7493
7494
7495
7496
7497
7498
7499
7500
7501
7502
7503
7504
7505
7506
7507
7508
7509
7510
7511
7512
7513
7514
7515
7516
7517
7518
7519
7520
7521
7522
7523
7524
7525
7526
7527
7528
7529
7530
7531
7532
7533
7534
7535
7536
7537
7538
7539
7540
7541
7542
7543
7544
7545
7546
7547
7548
7549
7550
7551
7552
7553
7554
7555
7556
7557
7558
7559
7560
7561
7562
7563
7564
7565
7566
7567
7568
7569
7570
7571
7572
7573
7574
7575
7576
7577
7578
7579
7580
7581
7582
7583
7584
7585
7586
7587
7588
7589
7590
7591
7592
7593
7594
7595
7596
7597
7598
7599
7600
7601
7602
7603
7604
7605
7606
7607
7608
7609
7610
7611
7612
7613
7614
7615
7616
7617
7618
7619
7620
7621
7622
7623
7624
7625
7626
7627
7628
7629
7630
7631
7632
7633
7634
7635
7636
7637
7638
7639
7640
7641
7642
7643
7644
7645
7646
7647
7648
7649
7650
7651
7652
7653
7654
7655
7656
7657
7658
7659
7660
7661
7662
7663
7664
7665
7666
7667
7668
7669
7670
7671
7672
7673
7674
7675
7676
7677
7678
7679
7680
7681
7682
7683
7684
7685
7686
7687
7688
7689
7690
7691
7692
7693
7694
7695
7696
7697
7698
7699
7700
7701
7702
7703
7704
7705
7706
7707
7708
7709
7710
7711
7712
7713
7714
7715
7716
7717
7718
7719
7720
7721
7722
7723
7724
7725
7726
7727
7728
7729
7730
7731
7732
7733
7734
7735
7736
7737
7738
7739
7740
7741
7742
7743
7744
7745
7746
7747
7748
7749
7750
7751
7752
7753
7754
7755
7756
7757
7758
7759
7760
7761
7762
7763
7764
7765
7766
7767
7768
7769
7770
7771
7772
7773
7774
7775
7776
7777
7778
7779
7780
7781
7782
7783
7784
7785
7786
7787
7788
7789
7790
7791
7792
7793
7794
7795
7796
7797
7798
7799
7800
7801
7802
7803
7804
7805
7806
7807
7808
7809
7810
7811
7812
7813
7814
7815
7816
7817
7818
7819
7820
7821
7822
7823
7824
7825
7826
7827
7828
7829
7830
7831
7832
7833
7834
7835
7836
7837
7838
7839
7840
7841
7842
7843
7844
7845
7846
7847
7848
7849
7850
7851
7852
7853
7854
7855
7856
7857
7858
7859
7860
7861
7862
7863
7864
7865
7866
7867
7868
7869
7870
7871
7872
7873
7874
7875
7876
7877
7878
7879
7880
7881
7882
7883
7884
7885
7886
7887
7888
7889
7890
7891
7892
7893
7894
7895
7896
7897
7898
7899
7900
7901
7902
7903
7904
7905
7906
7907
7908
7909
7910
7911
7912
7913
7914
7915
7916
7917
7918
7919
7920
7921
7922
7923
7924
7925
7926
7927
7928
7929
7930
7931
7932
7933
7934
7935
7936
7937
7938
7939
7940
7941
7942
7943
7944
7945
7946
7947
7948
7949
7950
7951
7952
7953
7954
7955
7956
7957
7958
7959
7960
7961
7962
7963
7964
7965
7966
7967
7968
7969
7970
7971
7972
7973
7974
7975
7976
7977
7978
7979
7980
7981
7982
7983
7984
7985
7986
7987
7988
7989
7990
7991
7992
7993
7994
7995
7996
7997
7998
7999
8000
8001
8002
8003
8004
8005
8006
8007
8008
8009
8010
8011
8012
8013
8014
8015
8016
8017
8018
8019
8020
8021
8022
8023
8024
8025
8026
8027
8028
8029
8030
8031
8032
8033
8034
8035
8036
8037
8038
8039
8040
8041
8042
8043
8044
8045
8046
8047
8048
8049
8050
8051
8052
8053
8054
8055
8056
8057
8058
8059
8060
8061
8062
8063
8064
8065
8066
8067
8068
8069
8070
8071
8072
8073
8074
8075
8076
8077
8078
8079
8080
8081
8082
8083
8084
8085
8086
8087
8088
8089
8090
8091
8092
8093
8094
8095
8096
8097
8098
8099
8100
8101
8102
8103
8104
8105
8106
8107
8108
8109
8110
8111
8112
8113
8114
8115
8116
8117
8118
8119
8120
8121
8122
8123
8124
8125
8126
8127
8128
8129
8130
8131
8132
8133
8134
8135
8136
8137
8138
8139
8140
8141
8142
8143
8144
8145
8146
8147
8148
8149
8150
8151
8152
8153
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/addrspace.h linux-libc-headers-2.6.8.0/include/asm-mips/addrspace.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/addrspace.h	2004-03-28 07:51:50.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/addrspace.h	2004-08-26 05:53:12.000000000 -0500
@@ -10,7 +10,23 @@
 #ifndef _ASM_ADDRSPACE_H
 #define _ASM_ADDRSPACE_H
 
-#include <spaces.h>
+/**********************************************************************/
+/* Include the common bits for #include <spaces.h> */
+#ifndef __mips64
+
+#define CAC_BASE		0x80000000
+#define IO_BASE			0xa0000000
+#define UNCAC_BASE		0xa0000000
+#define MAP_BASE		0xc0000000
+
+/*
+ * This handles the memory map.
+ * We handle pages at KSEG0 for kernels with 32 bit address space.
+ */
+#define PAGE_OFFSET		0x80000000UL
+
+#endif /* ndef __mips64 */
+/**********************************************************************/
 
 /*
  *  Configure language
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/asmmacro.h linux-libc-headers-2.6.8.0/include/asm-mips/asmmacro.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/asmmacro.h	2004-08-18 13:15:41.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/asm-mips/asmmacro.h	2004-08-26 05:14:41.000000000 -0500
@@ -9,10 +9,10 @@
 #define _ASM_ASMMACRO_H
  
  
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
 #include <asm/asmmacro-32.h>
 #endif
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
 #include <asm/asmmacro-64.h>
 #endif
 
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/checksum.h linux-libc-headers-2.6.8.0/include/asm-mips/checksum.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/checksum.h	2004-06-23 16:52:45.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/asm-mips/checksum.h	2004-08-26 05:14:41.000000000 -0500
@@ -125,7 +125,7 @@
 {
 	__asm__(
 	".set\tnoat\t\t\t# csum_tcpudp_nofold\n\t"
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
 	"addu\t%0, %2\n\t"
 	"sltu\t$1, %0, %2\n\t"
 	"addu\t%0, $1\n\t"
@@ -138,7 +138,7 @@
 	"sltu\t$1, %0, %4\n\t"
 	"addu\t%0, $1\n\t"
 #endif
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
 	"daddu\t%0, %2\n\t"
 	"daddu\t%0, %3\n\t"
 	"daddu\t%0, %4\n\t"
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/compat.h linux-libc-headers-2.6.8.0/include/asm-mips/compat.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/compat.h	2003-12-15 12:47:02.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/compat.h	2004-08-26 05:23:05.000000000 -0500
@@ -8,64 +8,64 @@
 
 #define COMPAT_USER_HZ	100
 
-typedef u32		compat_size_t;
-typedef s32		compat_ssize_t;
-typedef s32		compat_time_t;
-typedef s32		compat_clock_t;
-typedef s32		compat_suseconds_t;
-
-typedef s32		compat_pid_t;
-typedef s32		compat_uid_t;
-typedef s32		compat_gid_t;
-typedef u32		compat_mode_t;
-typedef u32		compat_ino_t;
-typedef u32		compat_dev_t;
-typedef s32		compat_off_t;
-typedef s64		compat_loff_t;
-typedef u32		compat_nlink_t;
-typedef s32		compat_ipc_pid_t;
-typedef s32		compat_daddr_t;
-typedef s32		compat_caddr_t;
+typedef __u32		compat_size_t;
+typedef __s32		compat_ssize_t;
+typedef __s32		compat_time_t;
+typedef __s32		compat_clock_t;
+typedef __s32		compat_suseconds_t;
+
+typedef __s32		compat_pid_t;
+typedef __s32		compat_uid_t;
+typedef __s32		compat_gid_t;
+typedef __u32		compat_mode_t;
+typedef __u32		compat_ino_t;
+typedef __u32		compat_dev_t;
+typedef __s32		compat_off_t;
+typedef __s64		compat_loff_t;
+typedef __u32		compat_nlink_t;
+typedef __s32		compat_ipc_pid_t;
+typedef __s32		compat_daddr_t;
+typedef __s32		compat_caddr_t;
 typedef struct {
-	s32	val[2];
+	__s32	val[2];
 } compat_fsid_t;
 
-typedef s32		compat_int_t;
-typedef s32		compat_long_t;
-typedef u32		compat_uint_t;
-typedef u32		compat_ulong_t;
+typedef __s32		compat_int_t;
+typedef __s32		compat_long_t;
+typedef __u32		compat_uint_t;
+typedef __u32		compat_ulong_t;
 
 struct compat_timespec {
 	compat_time_t	tv_sec;
-	s32		tv_nsec;
+	__s32		tv_nsec;
 };
 
 struct compat_timeval {
 	compat_time_t	tv_sec;
-	s32		tv_usec;
+	__s32		tv_usec;
 };
 
 struct compat_stat {
 	compat_dev_t	st_dev;
-	s32		st_pad1[3];
+	__s32		st_pad1[3];
 	compat_ino_t	st_ino;
 	compat_mode_t	st_mode;
 	compat_nlink_t	st_nlink;
 	compat_uid_t	st_uid;
 	compat_gid_t	st_gid;
 	compat_dev_t	st_rdev;
-	s32		st_pad2[2];
+	__s32		st_pad2[2];
 	compat_off_t	st_size;
-	s32		st_pad3;
+	__s32		st_pad3;
 	compat_time_t	st_atime;
-	s32		st_atime_nsec;
+	__s32		st_atime_nsec;
 	compat_time_t	st_mtime;
-	s32		st_mtime_nsec;
+	__s32		st_mtime_nsec;
 	compat_time_t	st_ctime;
-	s32		st_ctime_nsec;
-	s32		st_blksize;
-	s32		st_blocks;
-	s32		st_pad4[14];
+	__s32		st_ctime_nsec;
+	__s32		st_blksize;
+	__s32		st_blocks;
+	__s32		st_pad4[14];
 };
 
 struct compat_flock {
@@ -73,10 +73,10 @@
 	short		l_whence;
 	compat_off_t	l_start;
 	compat_off_t	l_len;
-	s32		l_sysid;
+	__s32		l_sysid;
 	compat_pid_t	l_pid;
 	short		__unused;
-	s32		pad[4];
+	__s32		pad[4];
 };
 
 #define F_GETLK64	33
@@ -107,12 +107,12 @@
 
 #define COMPAT_RLIM_INFINITY	0x7fffffffUL
 
-typedef u32		compat_old_sigset_t;	/* at least 32 bits */
+typedef __u32		compat_old_sigset_t;	/* at least 32 bits */
 
 #define _COMPAT_NSIG		128		/* Don't ask !$@#% ...  */
 #define _COMPAT_NSIG_BPW	32
 
-typedef u32		compat_sigset_word;
+typedef __u32		compat_sigset_word;
 
 #define COMPAT_OFF_T_MAX	0x7fffffff
 #define COMPAT_LOFF_T_MAX	0x7fffffffffffffffL
@@ -123,7 +123,7 @@
  * as pointers because the syscall entry code will have
  * appropriately comverted them already.
  */
-typedef u32		compat_uptr_t;
+typedef __u32		compat_uptr_t;
 
 static inline void *compat_ptr(compat_uptr_t uptr)
 {
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/ddb5xxx/ddb5074.h linux-libc-headers-2.6.8.0/include/asm-mips/ddb5xxx/ddb5074.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/ddb5xxx/ddb5074.h	2003-12-15 12:47:03.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/ddb5xxx/ddb5074.h	2004-08-26 13:21:48.000000000 -0500
@@ -34,5 +34,5 @@
 extern void ddb5074_led_d2(int on);
 extern void ddb5074_led_d3(int on);
 
-extern void nile4_irq_setup(u32 base);
+extern void nile4_irq_setup(__u32 base);
 #endif
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/ddb5xxx/ddb5476.h linux-libc-headers-2.6.8.0/include/asm-mips/ddb5xxx/ddb5476.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/ddb5xxx/ddb5476.h	2003-12-15 12:47:03.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/ddb5xxx/ddb5476.h	2004-08-26 05:24:06.000000000 -0500
@@ -145,13 +145,13 @@
 extern void nile4_enable_irq(int nile4_irq);
 extern void nile4_disable_irq(int nile4_irq);
 extern void nile4_disable_irq_all(void);
-extern u16 nile4_get_irq_stat(int cpu_irq);
+extern __u16 nile4_get_irq_stat(int cpu_irq);
 extern void nile4_enable_irq_output(int cpu_irq);
 extern void nile4_disable_irq_output(int cpu_irq);
 extern void nile4_set_pci_irq_polarity(int pci_irq, int high);
 extern void nile4_set_pci_irq_level_or_edge(int pci_irq, int level);
 extern void nile4_clear_irq(int nile4_irq);
-extern void nile4_clear_irq_mask(u32 mask);
-extern u8 nile4_i8259_iack(void);
+extern void nile4_clear_irq_mask(__u32 mask);
+extern __u8 nile4_i8259_iack(void);
 extern void nile4_dump_irq_status(void);        /* Debug */
 #endif /* !__ASSEMBLY__ */
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/ddb5xxx/ddb5xxx.h linux-libc-headers-2.6.8.0/include/asm-mips/ddb5xxx/ddb5xxx.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/ddb5xxx/ddb5xxx.h	2004-01-17 17:03:47.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/ddb5xxx/ddb5xxx.h	2004-08-26 05:24:01.000000000 -0500
@@ -177,46 +177,46 @@
  * interrupt load
  */
 #ifndef CONFIG_DDB5074
-    volatile u32 *p = (volatile u32 *)0xbfc00000;
+    volatile __u32 *p = (volatile __u32 *)0xbfc00000;
     (void)(*p);
 #endif
 }
 
-static inline void ddb_out32(u32 offset, u32 val)
+static inline void ddb_out32(__u32 offset, __u32 val)
 {
-    *(volatile u32 *)(DDB_BASE+offset) = val;
+    *(volatile __u32 *)(DDB_BASE+offset) = val;
     ddb_sync();
 }
 
-static inline u32 ddb_in32(u32 offset)
+static inline __u32 ddb_in32(__u32 offset)
 {
-    u32 val = *(volatile u32 *)(DDB_BASE+offset);
+    __u32 val = *(volatile __u32 *)(DDB_BASE+offset);
     ddb_sync();
     return val;
 }
 
-static inline void ddb_out16(u32 offset, u16 val)
+static inline void ddb_out16(__u32 offset, __u16 val)
 {
-    *(volatile u16 *)(DDB_BASE+offset) = val;
+    *(volatile __u16 *)(DDB_BASE+offset) = val;
     ddb_sync();
 }
 
-static inline u16 ddb_in16(u32 offset)
+static inline __u16 ddb_in16(__u32 offset)
 {
-    u16 val = *(volatile u16 *)(DDB_BASE+offset);
+    __u16 val = *(volatile __u16 *)(DDB_BASE+offset);
     ddb_sync();
     return val;
 }
 
-static inline void ddb_out8(u32 offset, u8 val)
+static inline void ddb_out8(__u32 offset, __u8 val)
 {
-    *(volatile u8 *)(DDB_BASE+offset) = val;
+    *(volatile __u8 *)(DDB_BASE+offset) = val;
     ddb_sync();
 }
 
-static inline u8 ddb_in8(u32 offset)
+static inline __u8 ddb_in8(__u32 offset)
 {
-    u8 val = *(volatile u8 *)(DDB_BASE+offset);
+    __u8 val = *(volatile __u8 *)(DDB_BASE+offset);
     ddb_sync();
     return val;
 }
@@ -226,10 +226,10 @@
  *  Physical Device Address Registers
  */
 
-extern u32
-ddb_calc_pdar(u32 phys, u32 size, int width, int on_memory_bus, int pci_visible);
+extern __u32
+ddb_calc_pdar(__u32 phys, __u32 size, int width, int on_memory_bus, int pci_visible);
 extern void
-ddb_set_pdar(u32 pdar, u32 phys, u32 size, int width,
+ddb_set_pdar(__u32 pdar, __u32 phys, __u32 size, int width,
 	     int on_memory_bus, int pci_visible);
 
 /*
@@ -248,7 +248,7 @@
 #define DDB_PCI_ACCESS_32    0x10    /* for pci init0/1 regs */
 
 
-extern void ddb_set_pmr(u32 pmr, u32 type, u32 addr, u32 options);
+extern void ddb_set_pmr(__u32 pmr, __u32 type, __u32 addr, __u32 options);
 
 /*
  * we need to reset pci bus when we start up and shutdown
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/dec/ioasic.h linux-libc-headers-2.6.8.0/include/asm-mips/dec/ioasic.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/dec/ioasic.h	2004-01-17 17:03:47.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/dec/ioasic.h	2004-08-26 05:25:44.000000000 -0500
@@ -18,14 +18,14 @@
 
 extern spinlock_t ioasic_ssr_lock;
 
-extern volatile u32 *ioasic_base;
+extern volatile __u32 *ioasic_base;
 
-static inline void ioasic_write(unsigned int reg, u32 v)
+static inline void ioasic_write(unsigned int reg, __u32 v)
 {
 	ioasic_base[reg / 4] = v;
 }
 
-static inline u32 ioasic_read(unsigned int reg)
+static inline __u32 ioasic_read(unsigned int reg)
 {
 	return ioasic_base[reg / 4];
 }
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/dec/kn02.h linux-libc-headers-2.6.8.0/include/asm-mips/dec/kn02.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/dec/kn02.h	2004-01-17 17:03:47.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/dec/kn02.h	2004-08-26 05:25:47.000000000 -0500
@@ -97,7 +97,7 @@
 
 
 #ifndef __ASSEMBLY__
-extern u32 cached_kn02_csr;
+extern __u32 cached_kn02_csr;
 extern spinlock_t kn02_lock;
 extern void init_kn02_irqs(int base);
 #endif
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/elf.h linux-libc-headers-2.6.8.0/include/asm-mips/elf.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/elf.h	2004-03-28 07:51:51.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/elf.h	2004-08-26 05:17:25.000000000 -0500
@@ -122,7 +122,7 @@
 typedef double elf_fpreg_t;
 typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
 
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
 
 /*
  * This is used to ensure we don't load something for the wrong architecture.
@@ -150,9 +150,9 @@
  */
 #define ELF_CLASS	ELFCLASS32
 
-#endif /* CONFIG_MIPS32 */
+#endif /* ndef __mips64 */
 
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
 /*
  * This is used to ensure we don't load something for the wrong architecture.
  */
@@ -174,7 +174,7 @@
  */
 #define ELF_CLASS	ELFCLASS64
 
-#endif /* CONFIG_MIPS64 */
+#endif /* __mips64 */
 
 /*
  * These are used to set parameters in the core dumps.
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/galileo-boards/ev96100.h linux-libc-headers-2.6.8.0/include/asm-mips/galileo-boards/ev96100.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/galileo-boards/ev96100.h	2004-03-28 07:51:53.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/galileo-boards/ev96100.h	2004-08-26 05:23:12.000000000 -0500
@@ -46,9 +46,9 @@
  * bytes when running bigendian.
  */
 #define __GT_READ(ofs)							\
-	(*(volatile u32 *)(GT64120_BASE+(ofs)))
+	(*(volatile __u32 *)(GT64120_BASE+(ofs)))
 #define __GT_WRITE(ofs, data)						\
-	do { *(volatile u32 *)(GT64120_BASE+(ofs)) = (data); } while (0)
+	do { *(volatile __u32 *)(GT64120_BASE+(ofs)) = (data); } while (0)
 #define GT_READ(ofs)		le32_to_cpu(__GT_READ(ofs))
 #define GT_WRITE(ofs, data)	__GT_WRITE(ofs, cpu_to_le32(data))
 
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/galileo-boards/gt96100.h linux-libc-headers-2.6.8.0/include/asm-mips/galileo-boards/gt96100.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/galileo-boards/gt96100.h	2004-03-28 07:51:53.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/galileo-boards/gt96100.h	2004-08-26 05:23:17.000000000 -0500
@@ -27,9 +27,9 @@
 #define MIPS_GT96100_BASE (KSEG1ADDR(0x14000000))
 
 #define GT96100_WRITE(ofs, data) \
-    *(volatile u32 *)(MIPS_GT96100_BASE+ofs) = cpu_to_le32(data)
+    *(volatile __u32 *)(MIPS_GT96100_BASE+ofs) = cpu_to_le32(data)
 #define GT96100_READ(ofs) \
-    le32_to_cpu(*(volatile u32 *)(MIPS_GT96100_BASE+ofs))
+    le32_to_cpu(*(volatile __u32 *)(MIPS_GT96100_BASE+ofs))
 
 #define GT96100_ETH_IO_SIZE 0x4000
 
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/gt64120.h linux-libc-headers-2.6.8.0/include/asm-mips/gt64120.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/gt64120.h	2004-03-28 07:51:51.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/gt64120.h	2004-08-26 05:22:36.000000000 -0500
@@ -420,9 +420,9 @@
  * bytes when running bigendian.  We also provide non-swapping versions.
  */
 #define __GT_READ(ofs)							\
-	(*(volatile u32 *)(GT64120_BASE+(ofs)))
+	(*(volatile __u32 *)(GT64120_BASE+(ofs)))
 #define __GT_WRITE(ofs, data)						\
-	do { *(volatile u32 *)(GT64120_BASE+(ofs)) = (data); } while (0)
+	do { *(volatile __u32 *)(GT64120_BASE+(ofs)) = (data); } while (0)
 #define GT_READ(ofs)		le32_to_cpu(__GT_READ(ofs))
 #define GT_WRITE(ofs, data)	__GT_WRITE(ofs, cpu_to_le32(data))
 
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/io.h linux-libc-headers-2.6.8.0/include/asm-mips/io.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/io.h	2004-03-28 07:51:51.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/io.h	2004-08-26 05:24:16.000000000 -0500
@@ -173,14 +173,14 @@
 	unsigned long flags)
 {
 	if (cpu_has_64bit_addresses) {
-		u64 base = UNCAC_BASE;
+		__u64 base = UNCAC_BASE;
 
 		/*
 		 * R10000 supports a 2 bit uncached attribute therefore
 		 * UNCAC_BASE may not equal IO_BASE.
 		 */
 		if (flags == _CACHE_UNCACHED)
-			base = (u64) IO_BASE;
+			base = (__u64) IO_BASE;
 		return (void *) (unsigned long) (base + offset);
 	}
 
@@ -245,10 +245,10 @@
 #define __raw_readb(addr)	(*(volatile unsigned char *)(addr))
 #define __raw_readw(addr)	(*(volatile unsigned short *)(addr))
 #define __raw_readl(addr)	(*(volatile unsigned int *)(addr))
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
 #define ____raw_readq(addr)						\
 ({									\
-	u64 __res;							\
+	__u64 __res;							\
 									\
 	__asm__ __volatile__ (						\
 		"	.set	mips3		# ____raw_readq	\n"	\
@@ -263,7 +263,7 @@
 #define __raw_readq(addr)						\
 ({									\
 	unsigned long __flags;						\
-	u64 __res;							\
+	__u64 __res;							\
 									\
 	local_irq_save(__flags);					\
 	__res = ____raw_readq(addr);					\
@@ -271,7 +271,7 @@
 	__res;								\
 })
 #endif
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
 #define ____raw_readq(addr)	(*(volatile unsigned long *)(addr))
 #define __raw_readq(addr)	____raw_readq(addr)
 #endif
@@ -288,10 +288,10 @@
 #define __raw_writeb(b,addr)	((*(volatile unsigned char *)(addr)) = (b))
 #define __raw_writew(w,addr)	((*(volatile unsigned short *)(addr)) = (w))
 #define __raw_writel(l,addr)	((*(volatile unsigned int *)(addr)) = (l))
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
 #define ____raw_writeq(val,addr)						\
 ({									\
-	u64 __tmp;							\
+	__u64 __tmp;							\
 									\
 	__asm__ __volatile__ (						\
 		"	.set	mips3				\n"	\
@@ -313,7 +313,7 @@
 	local_irq_restore(__flags);					\
 })
 #endif
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
 #define ____raw_writeq(q,addr)	((*(volatile unsigned long *)(addr)) = (q))
 #define __raw_writeq(q,addr)	____raw_writeq(q, addr)
 #endif
@@ -400,28 +400,28 @@
 {
 	port = __swizzle_addr_b(port);
 
-	*(volatile u8 *)(mips_io_port_base + port) = __ioswab8(val);
+	*(volatile __u8 *)(mips_io_port_base + port) = __ioswab8(val);
 }
 
 static inline void __outw(unsigned short val, unsigned long port)
 {
 	port = __swizzle_addr_w(port);
 
-	*(volatile u16 *)(mips_io_port_base + port) = __ioswab16(val);
+	*(volatile __u16 *)(mips_io_port_base + port) = __ioswab16(val);
 }
 
 static inline void __outl(unsigned int val, unsigned long port)
 {
 	port = __swizzle_addr_l(port);
 
-	*(volatile u32 *)(mips_io_port_base + port) = __ioswab32(val);
+	*(volatile __u32 *)(mips_io_port_base + port) = __ioswab32(val);
 }
 
 static inline void __outb_p(unsigned char val, unsigned long port)
 {
 	port = __swizzle_addr_b(port);
 
-	*(volatile u8 *)(mips_io_port_base + port) = __ioswab8(val);
+	*(volatile __u8 *)(mips_io_port_base + port) = __ioswab8(val);
 	SLOW_DOWN_IO;
 }
 
@@ -429,7 +429,7 @@
 {
 	port = __swizzle_addr_w(port);
 
-	*(volatile u16 *)(mips_io_port_base + port) = __ioswab16(val);
+	*(volatile __u16 *)(mips_io_port_base + port) = __ioswab16(val);
 	SLOW_DOWN_IO;
 }
 
@@ -437,7 +437,7 @@
 {
 	port = __swizzle_addr_l(port);
 
-	*(volatile u32 *)(mips_io_port_base + port) = __ioswab32(val);
+	*(volatile __u32 *)(mips_io_port_base + port) = __ioswab32(val);
 	SLOW_DOWN_IO;
 }
 
@@ -452,30 +452,30 @@
 {
 	port = __swizzle_addr_b(port);
 
-	return __ioswab8(*(volatile u8 *)(mips_io_port_base + port));
+	return __ioswab8(*(volatile __u8 *)(mips_io_port_base + port));
 }
 
 static inline unsigned short __inw(unsigned long port)
 {
 	port = __swizzle_addr_w(port);
 
-	return __ioswab16(*(volatile u16 *)(mips_io_port_base + port));
+	return __ioswab16(*(volatile __u16 *)(mips_io_port_base + port));
 }
 
 static inline unsigned int __inl(unsigned long port)
 {
 	port = __swizzle_addr_l(port);
 
-	return __ioswab32(*(volatile u32 *)(mips_io_port_base + port));
+	return __ioswab32(*(volatile __u32 *)(mips_io_port_base + port));
 }
 
 static inline unsigned char __inb_p(unsigned long port)
 {
-	u8 __val;
+	__u8 __val;
 
 	port = __swizzle_addr_b(port);
 
-	__val = *(volatile u8 *)(mips_io_port_base + port);
+	__val = *(volatile __u8 *)(mips_io_port_base + port);
 	SLOW_DOWN_IO;
 
 	return __ioswab8(__val);
@@ -483,11 +483,11 @@
 
 static inline unsigned short __inw_p(unsigned long port)
 {
-	u16 __val;
+	__u16 __val;
 
 	port = __swizzle_addr_w(port);
 
-	__val = *(volatile u16 *)(mips_io_port_base + port);
+	__val = *(volatile __u16 *)(mips_io_port_base + port);
 	SLOW_DOWN_IO;
 
 	return __ioswab16(__val);
@@ -495,11 +495,11 @@
 
 static inline unsigned int __inl_p(unsigned long port)
 {
-	u32 __val;
+	__u32 __val;
 
 	port = __swizzle_addr_l(port);
 
-	__val = *(volatile u32 *)(mips_io_port_base + port);
+	__val = *(volatile __u32 *)(mips_io_port_base + port);
 	SLOW_DOWN_IO;
 
 	return __ioswab32(__val);
@@ -515,7 +515,7 @@
 static inline void __outsb(unsigned long port, void *addr, unsigned int count)
 {
 	while (count--) {
-		outb(*(u8 *)addr, port);
+		outb(*(__u8 *)addr, port);
 		addr++;
 	}
 }
@@ -523,7 +523,7 @@
 static inline void __insb(unsigned long port, void *addr, unsigned int count)
 {
 	while (count--) {
-		*(u8 *)addr = inb(port);
+		*(__u8 *)addr = inb(port);
 		addr++;
 	}
 }
@@ -531,7 +531,7 @@
 static inline void __outsw(unsigned long port, void *addr, unsigned int count)
 {
 	while (count--) {
-		outw(*(u16 *)addr, port);
+		outw(*(__u16 *)addr, port);
 		addr += 2;
 	}
 }
@@ -539,7 +539,7 @@
 static inline void __insw(unsigned long port, void *addr, unsigned int count)
 {
 	while (count--) {
-		*(u16 *)addr = inw(port);
+		*(__u16 *)addr = inw(port);
 		addr += 2;
 	}
 }
@@ -547,7 +547,7 @@
 static inline void __outsl(unsigned long port, void *addr, unsigned int count)
 {
 	while (count--) {
-		outl(*(u32 *)addr, port);
+		outl(*(__u32 *)addr, port);
 		addr += 4;
 	}
 }
@@ -555,7 +555,7 @@
 static inline void __insl(unsigned long port, void *addr, unsigned int count)
 {
 	while (count--) {
-		*(u32 *)addr = inl(port);
+		*(__u32 *)addr = inl(port);
 		addr += 4;
 	}
 }
@@ -617,7 +617,7 @@
 #define __CSR_32_ADJUST 0
 #endif
 
-#define csr_out32(v,a) (*(volatile u32 *)((unsigned long)(a) + __CSR_32_ADJUST) = (v))
-#define csr_in32(a)    (*(volatile u32 *)((unsigned long)(a) + __CSR_32_ADJUST))
+#define csr_out32(v,a) (*(volatile __u32 *)((unsigned long)(a) + __CSR_32_ADJUST) = (v))
+#define csr_in32(a)    (*(volatile __u32 *)((unsigned long)(a) + __CSR_32_ADJUST))
 
 #endif /* _ASM_IO_H */
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/ip32/mace.h linux-libc-headers-2.6.8.0/include/asm-mips/ip32/mace.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/ip32/mace.h	2004-06-09 07:00:41.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/asm-mips/ip32/mace.h	2004-08-26 05:14:41.000000000 -0500
@@ -22,7 +22,7 @@
 #undef BIT
 #define BIT(x) (1ULL << (x))
 
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
 typedef struct {
 	volatile unsigned long long reg;
 } mace64_t;
@@ -32,7 +32,7 @@
 	volatile unsigned long reg;
 } mace32_t;
 #endif
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
 typedef struct {
 	volatile unsigned long reg;
 } mace64_t;
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/it8172/it8172.h linux-libc-headers-2.6.8.0/include/asm-mips/it8172/it8172.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/it8172/it8172.h	2003-12-15 12:47:03.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/it8172/it8172.h	2004-08-26 05:22:54.000000000 -0500
@@ -336,13 +336,13 @@
 #define TIMER_TIDR				0x0E
 
 
-#define IT_WRITE(ofs, data) *(volatile u32 *)KSEG1ADDR((IT8172_BASE+ofs)) = data
-#define IT_READ(ofs, data)  data = *(volatile u32 *)KSEG1ADDR((IT8172_BASE+ofs))
+#define IT_WRITE(ofs, data) *(volatile __u32 *)KSEG1ADDR((IT8172_BASE+ofs)) = data
+#define IT_READ(ofs, data)  data = *(volatile __u32 *)KSEG1ADDR((IT8172_BASE+ofs))
 
-#define IT_IO_WRITE(ofs, data) *(volatile u32 *)KSEG1ADDR((IT8172_PCI_IO_BASE+ofs)) = data
-#define IT_IO_READ(ofs, data)  data = *(volatile u32 *)KSEG1ADDR((IT8172_PCI_IO_BASE+ofs))
+#define IT_IO_WRITE(ofs, data) *(volatile __u32 *)KSEG1ADDR((IT8172_PCI_IO_BASE+ofs)) = data
+#define IT_IO_READ(ofs, data)  data = *(volatile __u32 *)KSEG1ADDR((IT8172_PCI_IO_BASE+ofs))
 
-#define IT_IO_WRITE16(ofs, data) *(volatile u16 *)KSEG1ADDR((IT8172_PCI_IO_BASE+ofs)) = data
-#define IT_IO_READ16(ofs, data)  data = *(volatile u16 *)KSEG1ADDR((IT8172_PCI_IO_BASE+ofs))
+#define IT_IO_WRITE16(ofs, data) *(volatile __u16 *)KSEG1ADDR((IT8172_PCI_IO_BASE+ofs)) = data
+#define IT_IO_READ16(ofs, data)  data = *(volatile __u16 *)KSEG1ADDR((IT8172_PCI_IO_BASE+ofs))
 
 #endif
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/lasat/head.h linux-libc-headers-2.6.8.0/include/asm-mips/lasat/head.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/lasat/head.h	2003-12-15 12:47:03.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/lasat/head.h	2004-08-26 05:23:42.000000000 -0500
@@ -10,12 +10,12 @@
 #ifndef _LANGUAGE_ASSEMBLY
 #include <linux/types.h>
 struct bootloader_header {
-	u32 magic[2];
-	u32 version;
-	u32 image_start;
-	u32 image_size;
-	u32 kernel_start;
-	u32 kernel_entry;
+	__u32 magic[2];
+	__u32 version;
+	__u32 image_start;
+	__u32 image_size;
+	__u32 kernel_start;
+	__u32 kernel_entry;
 };
 #endif
 
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/lasat/lasat.h linux-libc-headers-2.6.8.0/include/asm-mips/lasat/lasat.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/lasat/lasat.h	2004-06-09 07:00:42.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/asm-mips/lasat/lasat.h	2004-08-26 05:23:50.000000000 -0500
@@ -25,9 +25,9 @@
 #ifndef _LANGUAGE_ASSEMBLY
 
 extern struct lasat_misc {
-	volatile u32 *reset_reg;
-	volatile u32 *flash_wp_reg;
-	u32 flash_wp_bit;
+	volatile __u32 *reset_reg;
+	volatile __u32 *flash_wp_reg;
+	__u32 flash_wp_bit;
 } *lasat_misc;
 
 enum lasat_mtdparts {
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/m48t35.h linux-libc-headers-2.6.8.0/include/asm-mips/m48t35.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/m48t35.h	2004-01-17 17:03:44.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/m48t35.h	2004-08-26 05:23:39.000000000 -0500
@@ -8,15 +8,15 @@
 extern spinlock_t rtc_lock;
 
 struct m48t35_rtc {
-	volatile u8	pad[0x7ff8];    /* starts at 0x7ff8 */
-	volatile u8	control;
-	volatile u8	sec;
-	volatile u8	min;
-	volatile u8	hour;
-	volatile u8	day;
-	volatile u8	date;
-	volatile u8	month;
-	volatile u8	year;
+	volatile __u8	pad[0x7ff8];    /* starts at 0x7ff8 */
+	volatile __u8	control;
+	volatile __u8	sec;
+	volatile __u8	min;
+	volatile __u8	hour;
+	volatile __u8	day;
+	volatile __u8	date;
+	volatile __u8	month;
+	volatile __u8	year;
 };
 
 #define M48T35_RTC_SET		0x80
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/mips-boards/bonito64.h linux-libc-headers-2.6.8.0/include/asm-mips/mips-boards/bonito64.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/mips-boards/bonito64.h	2004-03-28 07:51:54.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/mips-boards/bonito64.h	2004-08-26 05:21:59.000000000 -0500
@@ -34,7 +34,7 @@
 extern unsigned long _pcictrl_bonito;
 extern unsigned long _pcictrl_bonito_pcicfg;
 
-#define BONITO(x)		*(volatile u32 *)(_pcictrl_bonito + (x))
+#define BONITO(x)		*(volatile __u32 *)(_pcictrl_bonito + (x))
 
 #endif /* __ASSEMBLY__ */
 
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/mips-boards/generic.h linux-libc-headers-2.6.8.0/include/asm-mips/mips-boards/generic.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/mips-boards/generic.h	2004-03-28 07:51:54.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/mips-boards/generic.h	2004-08-26 05:22:06.000000000 -0500
@@ -74,7 +74,7 @@
 #define MIPS_REVISION_CORID_CORE_EMUL_BON  0x63
 #define MIPS_REVISION_CORID_CORE_EMUL_MSC  0x65
 
-#define MIPS_REVISION_CORID (((*(volatile u32 *)ioremap(MIPS_REVISION_REG, 4)) >> 10) & 0x3f)
+#define MIPS_REVISION_CORID (((*(volatile __u32 *)ioremap(MIPS_REVISION_REG, 4)) >> 10) & 0x3f)
 
 extern unsigned int mips_revision_corid;
 
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/mips-boards/msc01_pci.h linux-libc-headers-2.6.8.0/include/asm-mips/mips-boards/msc01_pci.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/mips-boards/msc01_pci.h	2004-03-28 07:51:54.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/mips-boards/msc01_pci.h	2004-08-26 05:22:10.000000000 -0500
@@ -212,8 +212,8 @@
 
 #define MSC01_PCI_REG_BASE	_pcictrl_msc
 
-#define MSC_WRITE(reg, data)	do { *(volatile u32 *)(reg) = data; } while (0)
-#define MSC_READ(reg, data)	do { data = *(volatile u32 *)(reg); } while (0)
+#define MSC_WRITE(reg, data)	do { *(volatile __u32 *)(reg) = data; } while (0)
+#define MSC_READ(reg, data)	do { data = *(volatile __u32 *)(reg); } while (0)
 
 /*
  * Registers absolute addresses
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/mipsregs.h linux-libc-headers-2.6.8.0/include/asm-mips/mipsregs.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/mipsregs.h	2004-08-18 13:15:41.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/asm-mips/mipsregs.h	2004-08-26 13:00:51.000000000 -0500
@@ -14,7 +14,6 @@
 #define _ASM_MIPSREGS_H
 
 #include <linux/linkage.h>
-#include <asm/hazards.h>
 
 /*
  * The following macros are especially useful for __asm__
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/mmu_context.h linux-libc-headers-2.6.8.0/include/asm-mips/mmu_context.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/mmu_context.h	2004-08-18 13:15:41.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/asm-mips/mmu_context.h	2004-08-26 05:14:41.000000000 -0500
@@ -27,12 +27,12 @@
  */
 #define TLBMISS_HANDLER_SETUP_PGD(pgd) \
 	pgd_current[smp_processor_id()] = (unsigned long)(pgd)
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
 #define TLBMISS_HANDLER_SETUP() \
 	write_c0_context((unsigned long) smp_processor_id() << 23); \
 	TLBMISS_HANDLER_SETUP_PGD(swapper_pg_dir)
 #endif
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
 #define TLBMISS_HANDLER_SETUP() \
 	write_c0_context((unsigned long) &pgd_current[smp_processor_id()] << 23); \
 	TLBMISS_HANDLER_SETUP_PGD(swapper_pg_dir)
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/module.h linux-libc-headers-2.6.8.0/include/asm-mips/module.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/module.h	2004-08-18 13:15:41.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/asm-mips/module.h	2004-08-26 05:14:41.000000000 -0500
@@ -21,7 +21,7 @@
   Elf64_Sxword r_addend;		/* Addend.  */
 } Elf64_Mips_Rela;
 
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
 
 #define Elf_Shdr	Elf32_Shdr
 #define Elf_Sym		Elf32_Sym
@@ -29,7 +29,7 @@
 
 #endif
 
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
 
 #define Elf_Shdr	Elf64_Shdr
 #define Elf_Sym		Elf64_Sym
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/msgbuf.h linux-libc-headers-2.6.8.0/include/asm-mips/msgbuf.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/msgbuf.h	2004-01-17 17:03:44.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/msgbuf.h	2004-08-26 05:15:04.000000000 -0500
@@ -14,25 +14,25 @@
 
 struct msqid64_ds {
 	struct ipc64_perm msg_perm;
-#if defined(CONFIG_MIPS32) && !defined(CONFIG_CPU_LITTLE_ENDIAN)
+#if !defined(__mips64) && !defined(CONFIG_CPU_LITTLE_ENDIAN)
 	unsigned long	__unused1;
 #endif
 	__kernel_time_t msg_stime;	/* last msgsnd time */
-#if defined(CONFIG_MIPS32) && defined(CONFIG_CPU_LITTLE_ENDIAN)
+#if !defined(__mips64) && defined(CONFIG_CPU_LITTLE_ENDIAN)
 	unsigned long	__unused1;
 #endif
-#if defined(CONFIG_MIPS32) && !defined(CONFIG_CPU_LITTLE_ENDIAN)
+#if !defined(__mips64) && !defined(CONFIG_CPU_LITTLE_ENDIAN)
 	unsigned long	__unused2;
 #endif
 	__kernel_time_t msg_rtime;	/* last msgrcv time */
-#if defined(CONFIG_MIPS32) && defined(CONFIG_CPU_LITTLE_ENDIAN)
+#if !defined(__mips64) && defined(CONFIG_CPU_LITTLE_ENDIAN)
 	unsigned long	__unused2;
 #endif
-#if defined(CONFIG_MIPS32) && !defined(CONFIG_CPU_LITTLE_ENDIAN)
+#if !defined(__mips64) && !defined(CONFIG_CPU_LITTLE_ENDIAN)
 	unsigned long	__unused3;
 #endif
 	__kernel_time_t msg_ctime;	/* last change time */
-#if defined(CONFIG_MIPS32) && defined(CONFIG_CPU_LITTLE_ENDIAN)
+#if !defined(__mips64) && defined(CONFIG_CPU_LITTLE_ENDIAN)
 	unsigned long	__unused3;
 #endif
 	unsigned long  msg_cbytes;	/* current number of bytes on queue */
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/nile4.h linux-libc-headers-2.6.8.0/include/asm-mips/nile4.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/nile4.h	2003-12-15 12:47:02.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/nile4.h	2004-08-26 05:22:46.000000000 -0500
@@ -202,45 +202,45 @@
 
 static inline void nile4_sync(void)
 {
-    volatile u32 *p = (volatile u32 *)0xbfc00000;
+    volatile __u32 *p = (volatile __u32 *)0xbfc00000;
     (void)(*p);
 }
 
-static inline void nile4_out32(u32 offset, u32 val)
+static inline void nile4_out32(__u32 offset, __u32 val)
 {
-    *(volatile u32 *)(NILE4_BASE+offset) = val;
+    *(volatile __u32 *)(NILE4_BASE+offset) = val;
     nile4_sync();
 }
 
-static inline u32 nile4_in32(u32 offset)
+static inline __u32 nile4_in32(__u32 offset)
 {
-    u32 val = *(volatile u32 *)(NILE4_BASE+offset);
+    __u32 val = *(volatile __u32 *)(NILE4_BASE+offset);
     nile4_sync();
     return val;
 }
 
-static inline void nile4_out16(u32 offset, u16 val)
+static inline void nile4_out16(__u32 offset, __u16 val)
 {
-    *(volatile u16 *)(NILE4_BASE+offset) = val;
+    *(volatile __u16 *)(NILE4_BASE+offset) = val;
     nile4_sync();
 }
 
-static inline u16 nile4_in16(u32 offset)
+static inline __u16 nile4_in16(__u32 offset)
 {
-    u16 val = *(volatile u16 *)(NILE4_BASE+offset);
+    __u16 val = *(volatile __u16 *)(NILE4_BASE+offset);
     nile4_sync();
     return val;
 }
 
-static inline void nile4_out8(u32 offset, u8 val)
+static inline void nile4_out8(__u32 offset, __u8 val)
 {
-    *(volatile u8 *)(NILE4_BASE+offset) = val;
+    *(volatile __u8 *)(NILE4_BASE+offset) = val;
     nile4_sync();
 }
 
-static inline u8 nile4_in8(u32 offset)
+static inline __u8 nile4_in8(__u32 offset)
 {
-    u8 val = *(volatile u8 *)(NILE4_BASE+offset);
+    __u8 val = *(volatile __u8 *)(NILE4_BASE+offset);
     nile4_sync();
     return val;
 }
@@ -250,7 +250,7 @@
      *  Physical Device Address Registers
      */
 
-extern void nile4_set_pdar(u32 pdar, u32 phys, u32 size, int width,
+extern void nile4_set_pdar(__u32 pdar, __u32 phys, __u32 size, int width,
 			   int on_memory_bus, int visible);
 
 
@@ -276,7 +276,7 @@
 #define NILE4_PCI_IACK_BASE	NILE4_PCI_IO_BASE
 
 
-extern void nile4_set_pmr(u32 pmr, u32 type, u32 addr);
+extern void nile4_set_pmr(__u32 pmr, __u32 type, __u32 addr);
 
 
     /*
@@ -296,14 +296,14 @@
 extern void nile4_enable_irq(unsigned int nile4_irq);
 extern void nile4_disable_irq(unsigned int nile4_irq);
 extern void nile4_disable_irq_all(void);
-extern u16 nile4_get_irq_stat(int cpu_irq);
+extern __u16 nile4_get_irq_stat(int cpu_irq);
 extern void nile4_enable_irq_output(int cpu_irq);
 extern void nile4_disable_irq_output(int cpu_irq);
 extern void nile4_set_pci_irq_polarity(int pci_irq, int high);
 extern void nile4_set_pci_irq_level_or_edge(int pci_irq, int level);
 extern void nile4_clear_irq(int nile4_irq);
-extern void nile4_clear_irq_mask(u32 mask);
-extern u8 nile4_i8259_iack(void);
+extern void nile4_clear_irq_mask(__u32 mask);
+extern __u8 nile4_i8259_iack(void);
 extern void nile4_dump_irq_status(void);	/* Debug */
 
 #endif
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/paccess.h linux-libc-headers-2.6.8.0/include/asm-mips/paccess.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/paccess.h	2004-01-17 17:03:44.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/paccess.h	2004-08-26 05:17:48.000000000 -0500
@@ -14,11 +14,12 @@
 #define _ASM_PACCESS_H
 
 #include <linux/errno.h>
+#include <linux/linkage.h>
 
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
 #define __PA_ADDR	".word"
 #endif
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
 #define __PA_ADDR	".dword"
 #endif
 
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/pci/bridge.h linux-libc-headers-2.6.8.0/include/asm-mips/pci/bridge.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/pci/bridge.h	2004-03-28 07:51:54.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/pci/bridge.h	2004-08-26 05:25:40.000000000 -0500
@@ -48,9 +48,9 @@
  * All accesses to bridge hardware registers must be done
  * using 32-bit loads and stores.
  */
-typedef u32	bridgereg_t;
+typedef __u32	bridgereg_t;
 
-typedef u64	bridge_ate_t;
+typedef __u64	bridge_ate_t;
 
 /* pointers to bridge ATEs
  * are always "pointer to volatile"
@@ -199,37 +199,37 @@
 
 	/* PCI Device Configuration Spaces 0x020000-0x027FFF */
 	union {				/* make all access sizes available. */
-		u8	c[0x1000 / 1];
-		u16	s[0x1000 / 2];
-		u32	l[0x1000 / 4];
-		u64	d[0x1000 / 8];
+		__u8	c[0x1000 / 1];
+		__u16	s[0x1000 / 2];
+		__u32	l[0x1000 / 4];
+		__u64	d[0x1000 / 8];
 		union {
-			u8	c[0x100 / 1];
-			u16	s[0x100 / 2];
-			u32	l[0x100 / 4];
-			u64	d[0x100 / 8];
+			__u8	c[0x100 / 1];
+			__u16	s[0x100 / 2];
+			__u32	l[0x100 / 4];
+			__u64	d[0x100 / 8];
 		} f[8];
 	} b_type0_cfg_dev[8];					/* 0x020000 */
 
     /* PCI Type 1 Configuration Space 0x028000-0x028FFF */
 	union {				/* make all access sizes available. */
-		u8	c[0x1000 / 1];
-		u16	s[0x1000 / 2];
-		u32	l[0x1000 / 4];
-		u64	d[0x1000 / 8];
+		__u8	c[0x1000 / 1];
+		__u16	s[0x1000 / 2];
+		__u32	l[0x1000 / 4];
+		__u64	d[0x1000 / 8];
 	} b_type1_cfg;					/* 0x028000-0x029000 */
 
 	char	_pad_029000[0x007000];			/* 0x029000-0x030000 */
 
 	/* PCI Interrupt Acknowledge Cycle 0x030000 */
 	union {
-		u8	c[8 / 1];
-		u16	s[8 / 2];
-		u32	l[8 / 4];
-		u64	d[8 / 8];
+		__u8	c[8 / 1];
+		__u16	s[8 / 2];
+		__u32	l[8 / 4];
+		__u64	d[8 / 8];
 	} b_pci_iack;						/* 0x030000 */
 
-	u8	_pad_030007[0x04fff8];			/* 0x030008-0x07FFFF */
+	__u8	_pad_030007[0x04fff8];			/* 0x030008-0x07FFFF */
 
 	/* External Address Translation Entry RAM 0x080000-0x0FFFFF */
 	bridge_ate_t    b_ext_ate_ram[0x10000];
@@ -239,10 +239,10 @@
 
 	/* PCI/GIO Device Spaces 0x200000-0xBFFFFF */
 	union {				/* make all access sizes available. */
-		u8	c[0x100000 / 1];
-		u16	s[0x100000 / 2];
-		u32	l[0x100000 / 4];
-		u64	d[0x100000 / 8];
+		__u8	c[0x100000 / 1];
+		__u16	s[0x100000 / 2];
+		__u32	l[0x100000 / 4];
+		__u64	d[0x100000 / 8];
 	} b_devio_raw[10];				/* 0x200000 */
 
 	/* b_devio macro is a bit strange; it reflects the
@@ -253,10 +253,10 @@
 
 	/* External Flash Proms 1,0 0xC00000-0xFFFFFF */
 	union {		/* make all access sizes available. */
-		u8	c[0x400000 / 1];	/* read-only */
-		u16	s[0x400000 / 2];	/* read-write */
-		u32	l[0x400000 / 4];	/* read-only */
-		u64	d[0x400000 / 8];	/* read-only */
+		__u8	c[0x400000 / 1];	/* read-only */
+		__u16	s[0x400000 / 2];	/* read-write */
+		__u32	l[0x400000 / 4];	/* read-only */
+		__u64	d[0x400000 / 8];	/* read-only */
 	} b_external_flash;			/* 0xC00000 */
 } bridge_t;
 
@@ -266,9 +266,9 @@
  */
 typedef struct bridge_err_cmdword_s {
 	union {
-		u32		cmd_word;
+		__u32		cmd_word;
 		struct {
-			u32	didn:4,		/* Destination ID */
+			__u32	didn:4,		/* Destination ID */
 				sidn:4,		/* Source ID	  */
 				pactyp:4,	/* Packet type	  */
 				tnum:5,		/* Trans Number	  */
@@ -799,17 +799,17 @@
 #ifndef __ASSEMBLY__
 /* Address translation entry for mapped pci32 accesses */
 typedef union ate_u {
-	u64	ent;
+	__u64	ent;
 	struct ate_s {
-		u64	rmf:16;
-		u64	addr:36;
-		u64	targ:4;
-		u64	reserved:3;
-		u64	barrier:1;
-		u64	prefetch:1;
-		u64	precise:1;
-		u64	coherent:1;
-		u64	valid:1;
+		__u64	rmf:16;
+		__u64	addr:36;
+		__u64	targ:4;
+		__u64	reserved:3;
+		__u64	barrier:1;
+		__u64	prefetch:1;
+		__u64	precise:1;
+		__u64	coherent:1;
+		__u64	valid:1;
 	} field;
 } ate_t;
 #endif /* !__ASSEMBLY__ */
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/pci_channel.h linux-libc-headers-2.6.8.0/include/asm-mips/pci_channel.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/pci_channel.h	2004-03-28 07:51:52.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/pci_channel.h	2004-08-26 05:21:47.000000000 -0500
@@ -41,6 +41,6 @@
 /*
  * board supplied pci irq fixup routine
  */
-extern int pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin);
+extern int pcibios_map_irq(struct pci_dev *dev, __u8 slot, __u8 pin);
 
 #endif  /* __ASM_PCI_CHANNEL_H */
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/pgalloc.h linux-libc-headers-2.6.8.0/include/asm-mips/pgalloc.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/pgalloc.h	2004-06-09 07:00:41.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/asm-mips/pgalloc.h	2004-08-26 05:14:41.000000000 -0500
@@ -85,7 +85,7 @@
 
 #define __pte_free_tlb(tlb,pte)		tlb_remove_page((tlb),(pte))
 
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
 #define pgd_populate(mm, pmd, pte)	BUG()
 
 /*
@@ -97,7 +97,7 @@
 #define __pmd_free_tlb(tlb,x)		do { } while (0)
 #endif
 
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
 
 #define pgd_populate(mm, pgd, pmd)	set_pgd(pgd, __pgd(pmd))
 
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/prctl.h linux-libc-headers-2.6.8.0/include/asm-mips/prctl.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/prctl.h	2003-12-15 12:47:02.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/prctl.h	2004-08-26 05:21:43.000000000 -0500
@@ -12,21 +12,21 @@
 #define PRDA ((struct prda *) PRDA_ADDRESS)
 
 struct prda_sys {
-	pid_t t_pid;
-        u32   t_hint;
-        u32   t_dlactseq;
-        u32   t_fpflags;
-        u32   t_prid;		/* processor type, $prid CP0 register */
-        u32   t_dlendseq;
-        u64   t_unused1[5];
-        pid_t t_rpid;
-        s32   t_resched;
-        u32   t_unused[8];
-        u32   t_cpu;		/* current/last cpu */
+	pid_t   t_pid;
+        __u32   t_hint;
+        __u32   t_dlactseq;
+        __u32   t_fpflags;
+        __u32   t_prid;		/* processor type, $prid CP0 register */
+        __u32   t_dlendseq;
+        __u64   t_unused1[5];
+        pid_t   t_rpid;
+        __s32   t_resched;
+        __u32   t_unused[8];
+        __u32   t_cpu;		/* current/last cpu */
 
 	/* FIXME: The signal information, not supported by Linux now */
-	u32   t_flags;		/* if true, then the sigprocmask is in userspace */
-	u32   t_sigprocmask [1]; /* the sigprocmask */
+	__u32   t_flags;		/* if true, then the sigprocmask is in userspace */
+	__u32   t_sigprocmask [1]; /* the sigprocmask */
 };
 
 struct prda {
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/processor.h linux-libc-headers-2.6.8.0/include/asm-mips/processor.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/processor.h	2004-08-18 13:15:41.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/asm-mips/processor.h	2004-08-26 05:23:24.000000000 -0500
@@ -102,7 +102,7 @@
 #define MCA_bus 0
 #define MCA_bus__is_a_macro /* for versions in ksyms.c */
 
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
 /*
  * User space process size: 2GB. This is hardcoded into a few places,
  * so don't change it unless you know what you are doing.
@@ -116,7 +116,7 @@
 #define TASK_UNMAPPED_BASE	(PAGE_ALIGN(TASK_SIZE / 3))
 #endif
 
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
 /*
  * User space process size: 1TB. This is hardcoded into a few places,
  * so don't change it unless you know what you are doing.  TASK_SIZE
@@ -142,7 +142,7 @@
 
 #define NUM_FPU_REGS	32
 
-typedef u64 fpureg_t;
+typedef __u64 fpureg_t;
 
 struct mips_fpu_hard_struct {
 	fpureg_t	fpr[NUM_FPU_REGS];
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/ptrace.h linux-libc-headers-2.6.8.0/include/asm-mips/ptrace.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/ptrace.h	2004-03-28 07:51:52.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/ptrace.h	2004-08-26 05:14:41.000000000 -0500
@@ -27,7 +27,7 @@
  * system call/exception. As usual the registers k0/k1 aren't being saved.
  */
 struct pt_regs {
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
 	/* Pad bytes for argument save space on the stack. */
 	unsigned long pad0[6];
 #endif
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/serial.h linux-libc-headers-2.6.8.0/include/asm-mips/serial.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/serial.h	2004-08-18 13:15:41.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/asm-mips/serial.h	2004-08-26 13:21:37.000000000 -0500
@@ -68,7 +68,7 @@
 
 #define _JAZZ_SERIAL_INIT(int, base)					\
 	{ .baud_base = JAZZ_BASE_BAUD, .irq = int, .flags = STD_COM_FLAGS,	\
-	  .iomem_base = (u8 *) base, .iomem_reg_shift = 0,			\
+	  .iomem_base = (__u8 *) base, .iomem_reg_shift = 0,			\
 	  .io_type = SERIAL_IO_MEM }
 #define JAZZ_SERIAL_PORT_DEFNS						\
 	_JAZZ_SERIAL_INIT(JAZZ_SERIAL1_IRQ, JAZZ_SERIAL1_BASE),		\
@@ -243,7 +243,7 @@
 #define _JAGUAR_ATX_SERIAL_INIT(int, base)				\
 	{ baud_base: JAGUAR_ATX_BASE_BAUD, irq: int,			\
 	  flags: (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST),		\
-	  iomem_base: (u8 *) base, iomem_reg_shift: 2,			\
+	  iomem_base: (__u8 *) base, iomem_reg_shift: 2,		\
 	  io_type: SERIAL_IO_MEM }
 #define MOMENCO_JAGUAR_ATX_SERIAL_PORT_DEFNS				\
 	_JAGUAR_ATX_SERIAL_INIT(JAGUAR_ATX_SERIAL1_IRQ, JAGUAR_ATX_SERIAL1_BASE)
@@ -260,7 +260,7 @@
 
 #define _OCELOT_SERIAL_INIT(int, base)					\
 	{ .baud_base = OCELOT_BASE_BAUD, .irq = int, .flags = STD_COM_FLAGS,	\
-	  .iomem_base = (u8 *) base, .iomem_reg_shift = 2,			\
+	  .iomem_base = (__u8 *) base, .iomem_reg_shift = 2,			\
 	  .io_type = SERIAL_IO_MEM }
 #define MOMENCO_OCELOT_SERIAL_PORT_DEFNS				\
 	_OCELOT_SERIAL_INIT(OCELOT_SERIAL1_IRQ, OCELOT_SERIAL1_BASE)
@@ -281,7 +281,7 @@
 
 #define _OCELOT_G_SERIAL_INIT(int, base)				\
 	{ .baud_base = OCELOT_G_BASE_BAUD, .irq = int, .flags = STD_COM_FLAGS,\
-	  .iomem_base = (u8 *) base, .iomem_reg_shift = 2,			\
+	  .iomem_base = (__u8 *) base, .iomem_reg_shift = 2,			\
 	  .io_type = SERIAL_IO_MEM }
 #define MOMENCO_OCELOT_G_SERIAL_PORT_DEFNS				\
 	_OCELOT_G_SERIAL_INIT(OCELOT_G_SERIAL1_IRQ, OCELOT_G_SERIAL1_BASE)
@@ -303,7 +303,7 @@
 	{ .baud_base		= OCELOT_C_BASE_BAUD,			\
 	  .irq			= (int),				\
 	  .flags		= STD_COM_FLAGS,			\
-	  .iomem_base		= (u8 *) base,				\
+	  .iomem_base		= (__u8 *) base,			\
 	  .iomem_reg_shift	= 2,					\
 	  .io_type		= SERIAL_IO_MEM				\
 	 }
@@ -318,10 +318,10 @@
 #include <asm/ddb5xxx/ddb5477.h>
 #define DDB5477_SERIAL_PORT_DEFNS                                       \
         { .baud_base = BASE_BAUD, .irq = VRC5477_IRQ_UART0, 		\
-	  .flags = STD_COM_FLAGS, .iomem_base = (u8*)0xbfa04200, 	\
+	  .flags = STD_COM_FLAGS, .iomem_base = (__u8*)0xbfa04200, 	\
 	  .iomem_reg_shift = 3, .io_type = SERIAL_IO_MEM},		\
         { .baud_base = BASE_BAUD, .irq = VRC5477_IRQ_UART1, 		\
-	  .flags = STD_COM_FLAGS, .iomem_base = (u8*)0xbfa04240, 	\
+	  .flags = STD_COM_FLAGS, .iomem_base = (__u8*)0xbfa04240, 	\
 	  .iomem_reg_shift = 3, .io_type = SERIAL_IO_MEM},
 #else
 #define DDB5477_SERIAL_PORT_DEFNS
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/sgi/hpc3.h linux-libc-headers-2.6.8.0/include/asm-mips/sgi/hpc3.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sgi/hpc3.h	2003-12-15 12:47:03.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/sgi/hpc3.h	2004-08-26 05:24:34.000000000 -0500
@@ -17,8 +17,8 @@
 
 /* An HPC DMA descriptor. */
 struct hpc_dma_desc {
-	u32 pbuf;	/* physical address of data buffer */
-	u32 cntinfo;	/* counter and info bits */
+	__u32 pbuf;	/* physical address of data buffer */
+	__u32 cntinfo;	/* counter and info bits */
 #define HPCDMA_EOX	0x80000000 /* last desc in chain for tx */
 #define HPCDMA_EOR	0x80000000 /* last desc in chain for rx */
 #define HPCDMA_EOXP	0x40000000 /* end of packet for tx */
@@ -30,15 +30,15 @@
 #define HPCDMA_OWN	0x00004000 /* Denotes ring buffer ownership on rx */
 #define HPCDMA_BCNT	0x00003fff /* size in bytes of this dma buffer */
 
-	u32 pnext;	/* paddr of next hpc_dma_desc if any */
+	__u32 pnext;	/* paddr of next hpc_dma_desc if any */
 };
 
 /* The set of regs for each HPC3 PBUS DMA channel. */
 struct hpc3_pbus_dmacregs {
-	volatile u32 pbdma_bptr;	/* pbus dma channel buffer ptr */
-	volatile u32 pbdma_dptr;	/* pbus dma channel desc ptr */
-	u32 _unused0[0x1000/4 - 2];	/* padding */
-	volatile u32 pbdma_ctrl;	/* pbus dma channel control register has
+	volatile __u32 pbdma_bptr;	/* pbus dma channel buffer ptr */
+	volatile __u32 pbdma_dptr;	/* pbus dma channel desc ptr */
+	__u32 _unused0[0x1000/4 - 2];	/* padding */
+	volatile __u32 pbdma_ctrl;	/* pbus dma channel control register has
 					 * copletely different meaning for read
 					 * compared with write */
 	/* read */
@@ -55,20 +55,20 @@
 #define HPC3_PDMACTRL_FB	0x003f0000 /* Ptr to beginning of fifo */
 #define HPC3_PDMACTRL_FE	0x3f000000 /* Ptr to end of fifo */
 
-	u32 _unused1[0x1000/4 - 1];	/* padding */
+	__u32 _unused1[0x1000/4 - 1];	/* padding */
 };
 
 /* The HPC3 SCSI registers, this does not include external ones. */
 struct hpc3_scsiregs {
-	volatile u32 cbptr;	/* current dma buffer ptr, diagnostic use only */
-	volatile u32 ndptr;	/* next dma descriptor ptr */
-	u32 _unused0[0x1000/4 - 2];	/* padding */
-	volatile u32 bcd;	/* byte count info */
+	volatile __u32 cbptr;	/* current dma buffer ptr, diagnostic use only */
+	volatile __u32 ndptr;	/* next dma descriptor ptr */
+	__u32 _unused0[0x1000/4 - 2];	/* padding */
+	volatile __u32 bcd;	/* byte count info */
 #define HPC3_SBCD_BCNTMSK 0x00003fff /* bytes to transfer from/to memory */
 #define HPC3_SBCD_XIE     0x00004000 /* Send IRQ when done with cur buf */
 #define HPC3_SBCD_EOX     0x00008000 /* Indicates this is last buf in chain */
 
-	volatile u32 ctrl;    /* control register */
+	volatile __u32 ctrl;    /* control register */
 #define HPC3_SCTRL_IRQ    0x01 /* IRQ asserted, either dma done or parity */
 #define HPC3_SCTRL_ENDIAN 0x02 /* DMA endian mode, 0=big 1=little */
 #define HPC3_SCTRL_DIR    0x04 /* DMA direction, 1=dev2mem 0=mem2dev */
@@ -78,9 +78,9 @@
 #define HPC3_SCTRL_CRESET 0x40 /* Resets dma channel and external controller */
 #define HPC3_SCTRL_PERR   0x80 /* Bad parity on HPC3 iface to scsi controller */
 
-	volatile u32 gfptr;	/* current GIO fifo ptr */
-	volatile u32 dfptr;	/* current device fifo ptr */
-	volatile u32 dconfig;	/* DMA configuration register */
+	volatile __u32 gfptr;	/* current GIO fifo ptr */
+	volatile __u32 dfptr;	/* current device fifo ptr */
+	volatile __u32 dconfig;	/* DMA configuration register */
 #define HPC3_SDCFG_HCLK 0x00001 /* Enable DMA half clock mode */
 #define HPC3_SDCFG_D1   0x00006 /* Cycles to spend in D1 state */
 #define HPC3_SDCFG_D2   0x00038 /* Cycles to spend in D2 state */
@@ -92,7 +92,7 @@
 #define HPC3_SDCFG_POLL 0x08000 /* hd_dreq polarity control */
 #define HPC3_SDCFG_ERLY 0x30000 /* hd_dreq behavior control bits */
 
-	volatile u32 pconfig;	/* PIO configuration register */
+	volatile __u32 pconfig;	/* PIO configuration register */
 #define HPC3_SPCFG_P3   0x0003 /* Cycles to spend in P3 state */
 #define HPC3_SPCFG_P2W  0x001c /* Cycles to spend in P2 state for writes */
 #define HPC3_SPCFG_P2R  0x01e0 /* Cycles to spend in P2 state for reads */
@@ -102,21 +102,21 @@
 #define HPC3_SPCFG_EPAR 0x4000 /* Enable parity checking for PIO */
 #define HPC3_SPCFG_FUJI 0x8000 /* Fujitsu scsi controller mode for faster dma/pio */
 
-	u32 _unused1[0x1000/4 - 6];	/* padding */
+	__u32 _unused1[0x1000/4 - 6];	/* padding */
 };
 
 /* SEEQ ethernet HPC3 registers, only one seeq per HPC3. */
 struct hpc3_ethregs {
 	/* Receiver registers. */
-	volatile u32 rx_cbptr;   /* current dma buffer ptr, diagnostic use only */
-	volatile u32 rx_ndptr;   /* next dma descriptor ptr */
-	u32 _unused0[0x1000/4 - 2];	/* padding */
-	volatile u32 rx_bcd;	/* byte count info */
+	volatile __u32 rx_cbptr;   /* current dma buffer ptr, diagnostic use only */
+	volatile __u32 rx_ndptr;   /* next dma descriptor ptr */
+	__u32 _unused0[0x1000/4 - 2];	/* padding */
+	volatile __u32 rx_bcd;	/* byte count info */
 #define HPC3_ERXBCD_BCNTMSK 0x00003fff /* bytes to be sent to memory */
 #define HPC3_ERXBCD_XIE     0x20000000 /* HPC3 interrupts cpu at end of this buf */
 #define HPC3_ERXBCD_EOX     0x80000000 /* flags this as end of descriptor chain */
 
-	volatile u32 rx_ctrl;	/* control register */
+	volatile __u32 rx_ctrl;	/* control register */
 #define HPC3_ERXCTRL_STAT50 0x0000003f /* Receive status reg bits of Seeq8003 */
 #define HPC3_ERXCTRL_STAT6  0x00000040 /* Rdonly irq status */
 #define HPC3_ERXCTRL_STAT7  0x00000080 /* Rdonlt old/new status bit from Seeq */
@@ -125,15 +125,15 @@
 #define HPC3_ERXCTRL_AMASK  0x00000400 /* Tells if ACTIVE inhibits PIO's to hpc3 */
 #define HPC3_ERXCTRL_RBO    0x00000800 /* Receive buffer overflow if set to 1 */
 
-	volatile u32 rx_gfptr;	/* current GIO fifo ptr */
-	volatile u32 rx_dfptr;	/* current device fifo ptr */
-	u32 _unused1;		/* padding */
-	volatile u32 rx_reset;	/* reset register */
+	volatile __u32 rx_gfptr;	/* current GIO fifo ptr */
+	volatile __u32 rx_dfptr;	/* current device fifo ptr */
+	__u32 _unused1;		/* padding */
+	volatile __u32 rx_reset;	/* reset register */
 #define HPC3_ERXRST_CRESET 0x1	/* Reset dma channel and external controller */
 #define HPC3_ERXRST_CLRIRQ 0x2	/* Clear channel interrupt */
 #define HPC3_ERXRST_LBACK  0x4	/* Enable diagnostic loopback mode of Seeq8003 */
 
-	volatile u32 rx_dconfig;	/* DMA configuration register */
+	volatile __u32 rx_dconfig;	/* DMA configuration register */
 #define HPC3_ERXDCFG_D1    0x0000f /* Cycles to spend in D1 state for PIO */
 #define HPC3_ERXDCFG_D2    0x000f0 /* Cycles to spend in D2 state for PIO */
 #define HPC3_ERXDCFG_D3    0x00f00 /* Cycles to spend in D3 state for PIO */
@@ -143,26 +143,26 @@
 #define HPC3_ERXDCFG_FIRQ  0x08000 /* Another bad packet timeout enable */
 #define HPC3_ERXDCFG_PTO   0x30000 /* Programmed timeout value for above two */
 
-	volatile u32 rx_pconfig;	/* PIO configuration register */
+	volatile __u32 rx_pconfig;	/* PIO configuration register */
 #define HPC3_ERXPCFG_P1    0x000f /* Cycles to spend in P1 state for PIO */
 #define HPC3_ERXPCFG_P2    0x00f0 /* Cycles to spend in P2 state for PIO */
 #define HPC3_ERXPCFG_P3    0x0f00 /* Cycles to spend in P3 state for PIO */
 #define HPC3_ERXPCFG_TST   0x1000 /* Diagnistic ram test feature bit */
 
-	u32 _unused2[0x1000/4 - 8];	/* padding */
+	__u32 _unused2[0x1000/4 - 8];	/* padding */
 
 	/* Transmitter registers. */
-	volatile u32 tx_cbptr;	/* current dma buffer ptr, diagnostic use only */
-	volatile u32 tx_ndptr;	/* next dma descriptor ptr */
-	u32 _unused3[0x1000/4 - 2];	/* padding */
-	volatile u32 tx_bcd;		/* byte count info */
+	volatile __u32 tx_cbptr;	/* current dma buffer ptr, diagnostic use only */
+	volatile __u32 tx_ndptr;	/* next dma descriptor ptr */
+	__u32 _unused3[0x1000/4 - 2];	/* padding */
+	volatile __u32 tx_bcd;		/* byte count info */
 #define HPC3_ETXBCD_BCNTMSK 0x00003fff	/* bytes to be read from memory */
 #define HPC3_ETXBCD_ESAMP   0x10000000	/* if set, too late to add descriptor */
 #define HPC3_ETXBCD_XIE     0x20000000	/* Interrupt cpu at end of cur desc */
 #define HPC3_ETXBCD_EOP     0x40000000	/* Last byte of cur buf is end of packet */
 #define HPC3_ETXBCD_EOX     0x80000000	/* This buf is the end of desc chain */
 
-	volatile u32 tx_ctrl;		/* control register */
+	volatile __u32 tx_ctrl;		/* control register */
 #define HPC3_ETXCTRL_STAT30 0x0000000f	/* Rdonly copy of seeq tx stat reg */
 #define HPC3_ETXCTRL_STAT4  0x00000010	/* Indicate late collision occurred */
 #define HPC3_ETXCTRL_STAT75 0x000000e0	/* Rdonly irq status from seeq */
@@ -170,9 +170,9 @@
 #define HPC3_ETXCTRL_ACTIVE 0x00000200	/* DMA tx channel is active */
 #define HPC3_ETXCTRL_AMASK  0x00000400	/* Indicates ACTIVE inhibits PIO's */
 
-	volatile u32 tx_gfptr;		/* current GIO fifo ptr */
-	volatile u32 tx_dfptr;		/* current device fifo ptr */
-	u32 _unused4[0x1000/4 - 4];	/* padding */
+	volatile __u32 tx_gfptr;		/* current GIO fifo ptr */
+	volatile __u32 tx_dfptr;		/* current device fifo ptr */
+	__u32 _unused4[0x1000/4 - 4];	/* padding */
 };
 
 struct hpc3_regs {
@@ -188,7 +188,7 @@
 	/* Here are where the hpc3 fifo's can be directly accessed
 	 * via PIO accesses.  Under normal operation we never stick
 	 * our grubby paws in here so it's just padding. */
-	u32 _unused0[0x18000/4];
+	__u32 _unused0[0x18000/4];
 
 	/* HPC3 irq status regs.  Due to a peculiar bug you need to
 	 * look at two different register addresses to get at all of
@@ -197,42 +197,42 @@
 	 * reliably report bits 9:5 of the hpc3 irq status.  I told
 	 * you it was a peculiar bug. ;-)
 	 */
-	volatile u32 istat0;		/* Irq status, only bits <4:0> reliable. */
+	volatile __u32 istat0;		/* Irq status, only bits <4:0> reliable. */
 #define HPC3_ISTAT_PBIMASK	0x0ff	/* irq bits for pbus devs 0 --> 7 */
 #define HPC3_ISTAT_SC0MASK	0x100	/* irq bit for scsi channel 0 */
 #define HPC3_ISTAT_SC1MASK	0x200	/* irq bit for scsi channel 1 */
 
-	volatile u32 gio_misc;		/* GIO misc control bits. */
+	volatile __u32 gio_misc;		/* GIO misc control bits. */
 #define HPC3_GIOMISC_ERTIME	0x1	/* Enable external timer real time. */
 #define HPC3_GIOMISC_DENDIAN	0x2	/* dma descriptor endian, 1=lit 0=big */
 
-	volatile u32 eeprom;		/* EEPROM data reg. */
+	volatile __u32 eeprom;		/* EEPROM data reg. */
 #define HPC3_EEPROM_EPROT	0x01	/* Protect register enable */
 #define HPC3_EEPROM_CSEL	0x02	/* Chip select */
 #define HPC3_EEPROM_ECLK	0x04	/* EEPROM clock */
 #define HPC3_EEPROM_DATO	0x08	/* Data out */
 #define HPC3_EEPROM_DATI	0x10	/* Data in */
 
-	volatile u32 istat1;		/* Irq status, only bits <9:5> reliable. */
-	volatile u32 bestat;		/* Bus error interrupt status reg. */
+	volatile __u32 istat1;		/* Irq status, only bits <9:5> reliable. */
+	volatile __u32 bestat;		/* Bus error interrupt status reg. */
 #define HPC3_BESTAT_BLMASK	0x000ff	/* Bus lane where bad parity occurred */
 #define HPC3_BESTAT_CTYPE	0x00100	/* Bus cycle type, 0=PIO 1=DMA */
 #define HPC3_BESTAT_PIDSHIFT	9
 #define HPC3_BESTAT_PIDMASK	0x3f700	/* DMA channel parity identifier */
 
-	u32 _unused1[0x14000/4 - 5];	/* padding */
+	__u32 _unused1[0x14000/4 - 5];	/* padding */
 	
 	/* Now direct PIO per-HPC3 peripheral access to external regs. */
-	volatile u32 scsi0_ext[256];	/* SCSI channel 0 external regs */
-	u32 _unused2[0x7c00/4];
-	volatile u32 scsi1_ext[256];	/* SCSI channel 1 external regs */
-	u32 _unused3[0x7c00/4];
-	volatile u32 eth_ext[320];	/* Ethernet external registers */
-	u32 _unused4[0x3b00/4];
+	volatile __u32 scsi0_ext[256];	/* SCSI channel 0 external regs */
+	__u32 _unused2[0x7c00/4];
+	volatile __u32 scsi1_ext[256];	/* SCSI channel 1 external regs */
+	__u32 _unused3[0x7c00/4];
+	volatile __u32 eth_ext[320];	/* Ethernet external registers */
+	__u32 _unused4[0x3b00/4];
 
 	/* Per-peripheral device external registers and DMA/PIO control. */
-	volatile u32 pbus_extregs[16][256];
-	volatile u32 pbus_dmacfg[8][128];
+	volatile __u32 pbus_extregs[16][256];
+	volatile __u32 pbus_dmacfg[8][128];
 	/* Cycles to spend in D3 for reads */
 #define HPC3_DMACFG_D3R_MASK		0x00000001
 #define HPC3_DMACFG_D3R_SHIFT		0
@@ -262,7 +262,7 @@
 #define HPC3_DMACFG_BURST_SHIFT	22
 	/* Use live pbus_dreq unsynchronized signal */
 #define HPC3_DMACFG_DRQLIVE		0x08000000
-	volatile u32 pbus_piocfg[16][64];
+	volatile __u32 pbus_piocfg[16][64];
 	/* Cycles to spend in P2 state for reads */
 #define HPC3_PIOCFG_P2R_MASK		0x00001
 #define HPC3_PIOCFG_P2R_SHIFT		0
@@ -287,21 +287,21 @@
 #define HPC3_PIOCFG_EVENHI		0x80000
 
 	/* PBUS PROM control regs. */
-	volatile u32 pbus_promwe;	/* PROM write enable register */
+	volatile __u32 pbus_promwe;	/* PROM write enable register */
 #define HPC3_PROM_WENAB	0x1	/* Enable writes to the PROM */
 
-	u32 _unused5[0x0800/4 - 1];
-	volatile u32 pbus_promswap;	/* Chip select swap reg */
+	__u32 _unused5[0x0800/4 - 1];
+	volatile __u32 pbus_promswap;	/* Chip select swap reg */
 #define HPC3_PROM_SWAP	0x1	/* invert GIO addr bit to select prom0 or prom1 */
 
-	u32 _unused6[0x0800/4 - 1];
-	volatile u32 pbus_gout;	/* PROM general purpose output reg */
+	__u32 _unused6[0x0800/4 - 1];
+	volatile __u32 pbus_gout;	/* PROM general purpose output reg */
 #define HPC3_PROM_STAT	0x1	/* General purpose status bit in gout */
 
-	u32 _unused7[0x1000/4 - 1];
-	volatile u32 rtcregs[14];	/* Dallas clock registers */
-	u32 _unused8[50];
-	volatile u32 bbram[8192-50-14];	/* Battery backed ram */
+	__u32 _unused7[0x1000/4 - 1];
+	volatile __u32 rtcregs[14];	/* Dallas clock registers */
+	__u32 _unused8[50];
+	volatile __u32 bbram[8192-50-14];	/* Battery backed ram */
 };
 
 /* 
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/sgi/ioc.h linux-libc-headers-2.6.8.0/include/asm-mips/sgi/ioc.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sgi/ioc.h	2004-03-28 07:51:54.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/sgi/ioc.h	2004-08-26 05:24:48.000000000 -0500
@@ -22,26 +22,26 @@
  */
 
 struct sgioc_uart_regs {
-	u8 _ctrl1[3];
-	volatile u8 ctrl1;
-	u8 _data1[3];
-	volatile u8 data1;
-	u8 _ctrl2[3];
-	volatile u8 ctrl2;
-	u8 _data2[3];
-	volatile u8 data2;
+	__u8 _ctrl1[3];
+	volatile __u8 ctrl1;
+	__u8 _data1[3];
+	volatile __u8 data1;
+	__u8 _ctrl2[3];
+	volatile __u8 ctrl2;
+	__u8 _data2[3];
+	volatile __u8 data2;
 };
 
 struct sgioc_keyb_regs {
-	u8 _data[3];
-	volatile u8 data;
-	u8 _command[3];
-	volatile u8 command;
+	__u8 _data[3];
+	volatile __u8 data;
+	__u8 _command[3];
+	volatile __u8 command;
 };
 
 struct sgint_regs {
-	u8 _istat0[3];
-	volatile u8 istat0;		/* Interrupt status zero */
+	__u8 _istat0[3];
+	volatile __u8 istat0;		/* Interrupt status zero */
 #define SGINT_ISTAT0_FFULL	0x01
 #define SGINT_ISTAT0_SCSI0	0x02
 #define SGINT_ISTAT0_SCSI1	0x04
@@ -50,10 +50,10 @@
 #define SGINT_ISTAT0_PPORT	0x20
 #define SGINT_ISTAT0_HPC2	0x40
 #define SGINT_ISTAT0_LIO2	0x80
-	u8 _imask0[3];
-	volatile u8 imask0;		/* Interrupt mask zero */
-	u8 _istat1[3];
-	volatile u8 istat1;		/* Interrupt status one */
+	__u8 _imask0[3];
+	volatile __u8 imask0;		/* Interrupt mask zero */
+	__u8 _istat1[3];
+	volatile __u8 istat1;		/* Interrupt status one */
 #define SGINT_ISTAT1_ISDNI	0x01
 #define SGINT_ISTAT1_PWR	0x02
 #define SGINT_ISTAT1_ISDNH	0x04
@@ -62,29 +62,29 @@
 #define SGINT_ISTAT1_AFAIL	0x20
 #define SGINT_ISTAT1_VIDEO	0x40
 #define SGINT_ISTAT1_GIO2	0x80
-	u8 _imask1[3];
-	volatile u8 imask1;		/* Interrupt mask one */
-	u8 _vmeistat[3];
-	volatile u8 vmeistat;		/* VME interrupt status */
-	u8 _cmeimask0[3];
-	volatile u8 cmeimask0;		/* VME interrupt mask zero */
-	u8 _cmeimask1[3];
-	volatile u8 cmeimask1;		/* VME interrupt mask one */
-	u8 _cmepol[3];
-	volatile u8 cmepol;		/* VME polarity */
-	u8 _tclear[3];
-	volatile u8 tclear;
-	u8 _errstat[3];
-	volatile u8 errstat;	/* Error status reg, reserved on INT2 */
-	u32 _unused0[2];
-	u8 _tcnt0[3];
-	volatile u8 tcnt0;		/* counter 0 */
-	u8 _tcnt1[3];
-	volatile u8 tcnt1;		/* counter 1 */
-	u8 _tcnt2[3];
-	volatile u8 tcnt2;		/* counter 2 */
-	u8 _tcword[3];
-	volatile u8 tcword;		/* control word */
+	__u8 _imask1[3];
+	volatile __u8 imask1;		/* Interrupt mask one */
+	__u8 _vmeistat[3];
+	volatile __u8 vmeistat;		/* VME interrupt status */
+	__u8 _cmeimask0[3];
+	volatile __u8 cmeimask0;		/* VME interrupt mask zero */
+	__u8 _cmeimask1[3];
+	volatile __u8 cmeimask1;		/* VME interrupt mask one */
+	__u8 _cmepol[3];
+	volatile __u8 cmepol;		/* VME polarity */
+	__u8 _tclear[3];
+	volatile __u8 tclear;
+	__u8 _errstat[3];
+	volatile __u8 errstat;	/* Error status reg, reserved on INT2 */
+	__u32 _unused0[2];
+	__u8 _tcnt0[3];
+	volatile __u8 tcnt0;		/* counter 0 */
+	__u8 _tcnt1[3];
+	volatile __u8 tcnt1;		/* counter 1 */
+	__u8 _tcnt2[3];
+	volatile __u8 tcnt2;		/* counter 2 */
+	__u8 _tcword[3];
+	volatile __u8 tcword;		/* control word */
 #define SGINT_TCWORD_BCD	0x01	/* Use BCD mode for counters */
 #define SGINT_TCWORD_MMASK	0x0e	/* Mode bitmask. */
 #define SGINT_TCWORD_MITC	0x00	/* IRQ on terminal count (doesn't work) */
@@ -115,55 +115,55 @@
 #define SGINT_TCSAMP_COUNTER	((SGINT_TIMER_CLOCK / HZ) + 255)
 
 /* We need software copies of these because they are write only. */
-extern u8 sgi_ioc_reset, sgi_ioc_write;
+extern __u8 sgi_ioc_reset, sgi_ioc_write;
 
 struct sgioc_regs {
 	struct pi1_regs pport;
-	u32 _unused0[2];
+	__u32 _unused0[2];
 	struct sgioc_uart_regs serport;
 	struct sgioc_keyb_regs kbdmouse;
-	u8 _gcsel[3];
-	volatile u8 gcsel;
-	u8 _genctrl[3];
-	volatile u8 genctrl;
-	u8 _panel[3];
-	volatile u8 panel;
+	__u8 _gcsel[3];
+	volatile __u8 gcsel;
+	__u8 _genctrl[3];
+	volatile __u8 genctrl;
+	__u8 _panel[3];
+	volatile __u8 panel;
 #define SGIOC_PANEL_POWERON	0x01
 #define SGIOC_PANEL_POWERINTR	0x02
 #define SGIOC_PANEL_VOLDNINTR	0x10
 #define SGIOC_PANEL_VOLDNHOLD	0x20
 #define SGIOC_PANEL_VOLUPINTR	0x40
 #define SGIOC_PANEL_VOLUPHOLD	0x80
-	u32 _unused1;
-	u8 _sysid[3];
-	volatile u8 sysid;
+	__u32 _unused1;
+	__u8 _sysid[3];
+	volatile __u8 sysid;
 #define SGIOC_SYSID_FULLHOUSE	0x01
 #define SGIOC_SYSID_BOARDREV(x)	((x & 0xe0) > 5) 
 #define SGIOC_SYSID_CHIPREV(x)	((x & 0x1e) > 1)
-	u32 _unused2;
-	u8 _read[3];
-	volatile u8 read;
-	u32 _unused3;
-	u8 _dmasel[3];
-	volatile u8 dmasel;
+	__u32 _unused2;
+	__u8 _read[3];
+	volatile __u8 read;
+	__u32 _unused3;
+	__u8 _dmasel[3];
+	volatile __u8 dmasel;
 #define SGIOC_DMASEL_SCLK10MHZ	0x00	/* use 10MHZ serial clock */
 #define SGIOC_DMASEL_ISDNB	0x01	/* enable isdn B */
 #define SGIOC_DMASEL_ISDNA	0x02	/* enable isdn A */
 #define SGIOC_DMASEL_PPORT	0x04	/* use parallel DMA */
 #define SGIOC_DMASEL_SCLK667MHZ	0x10	/* use 6.67MHZ serial clock */
 #define SGIOC_DMASEL_SCLKEXT	0x20	/* use external serial clock */
-	u32 _unused4;
-	u8 _reset[3];
-	volatile u8 reset;
+	__u32 _unused4;
+	__u8 _reset[3];
+	volatile __u8 reset;
 #define SGIOC_RESET_PPORT	0x01	/* 0=parport reset, 1=nornal */
 #define SGIOC_RESET_KBDMOUSE	0x02	/* 0=kbdmouse reset, 1=normal */
 #define SGIOC_RESET_EISA	0x04	/* 0=eisa reset, 1=normal */
 #define SGIOC_RESET_ISDN	0x08	/* 0=isdn reset, 1=normal */
 #define SGIOC_RESET_LC0OFF	0x10	/* guiness: turn led off (red, else green) */
 #define SGIOC_RESET_LC1OFF	0x20	/* guiness: turn led off (green, else amber) */
-	u32 _unused5;
-	u8 _write[3];
-	volatile u8 write;
+	__u32 _unused5;
+	__u8 _write[3];
+	volatile __u8 write;
 #define SGIOC_WRITE_NTHRESH	0x01	/* use 4.5db threshhold */
 #define SGIOC_WRITE_TPSPEED	0x02	/* use 100ohm TP speed */
 #define SGIOC_WRITE_EPSEL	0x04	/* force cable mode: 1=AUI 0=TP */
@@ -172,10 +172,10 @@
 #define SGIOC_WRITE_U0AMODE	0x20	/* 1=PC 0=MAC UART mode */
 #define SGIOC_WRITE_MLO		0x40	/* 1=4.75V 0=+5V */
 #define SGIOC_WRITE_MHI		0x80	/* 1=5.25V 0=+5V */
-	u32 _unused6;
+	__u32 _unused6;
 	struct sgint_regs int3;
-	u32 _unused7[16];
-	volatile u32 extio;		/* FullHouse only */
+	__u32 _unused7[16];
+	volatile __u32 extio;		/* FullHouse only */
 #define EXTIO_S0_IRQ_3		0x8000	/* S0: vid.vsync */
 #define EXTIO_S0_IRQ_2		0x4000	/* S0: gfx.fifofull */
 #define EXTIO_S0_IRQ_1		0x2000	/* S0: gfx.int */
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/sgi/mc.h linux-libc-headers-2.6.8.0/include/asm-mips/sgi/mc.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sgi/mc.h	2003-12-15 12:47:03.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/sgi/mc.h	2004-08-26 05:25:28.000000000 -0500
@@ -14,8 +14,8 @@
 #define _SGI_MC_H
 
 struct sgimc_regs {
-	u32 _unused0;
-	volatile u32 cpuctrl0;	/* CPU control register 0, readwrite */
+	__u32 _unused0;
+	volatile __u32 cpuctrl0;	/* CPU control register 0, readwrite */
 #define SGIMC_CCTRL0_REFS	0x0000000f /* REFS mask */
 #define SGIMC_CCTRL0_EREFRESH	0x00000010 /* Memory refresh enable */
 #define SGIMC_CCTRL0_EPERRGIO	0x00000020 /* GIO parity error enable */
@@ -35,8 +35,8 @@
 #define SGIMC_CCTRL0_CMEMBADPAR	0x02000000 /* Generate bad perr from cpu to mem */
 #define SGIMC_CCTRL0_R4KNOCHKPARR 0x04000000 /* Don't chk parity on mem data reads */
 #define SGIMC_CCTRL0_GIOBTOB	0x08000000 /* Allow GIO back to back writes */
-	u32 _unused1;
-	volatile u32 cpuctrl1;	/* CPU control register 1, readwrite */
+	__u32 _unused1;
+	volatile __u32 cpuctrl1;	/* CPU control register 1, readwrite */
 #define SGIMC_CCTRL1_EGIOTIMEO	0x00000010 /* GIO bus timeout enable */
 #define SGIMC_CCTRL1_FIXEDEHPC	0x00001000 /* Fixed HPC endianness */
 #define SGIMC_CCTRL1_LITTLEHPC	0x00002000 /* Little endian HPC */
@@ -45,33 +45,33 @@
 #define SGIMC_CCTRL1_FIXEDEEXP1	0x00010000 /* Fixed EXP1 endianness */
 #define SGIMC_CCTRL1_LITTLEEXP1	0x00020000 /* Little endian EXP1 */
 
-	u32 _unused2;
-	volatile u32 watchdogt;	/* Watchdog reg rdonly, write clears */
+	__u32 _unused2;
+	volatile __u32 watchdogt;	/* Watchdog reg rdonly, write clears */
 
-	u32 _unused3;
-	volatile u32 systemid;	/* MC system ID register, readonly */
+	__u32 _unused3;
+	volatile __u32 systemid;	/* MC system ID register, readonly */
 #define SGIMC_SYSID_MASKREV	0x0000000f /* Revision of MC controller */
 #define SGIMC_SYSID_EPRESENT	0x00000010 /* Indicates presence of EISA bus */
 
-	u32 _unused4[3];
-	volatile u32 divider;	/* Divider reg for RPSS */
+	__u32 _unused4[3];
+	volatile __u32 divider;	/* Divider reg for RPSS */
 
-	u32 _unused5;
-	volatile u32 eeprom;	/* EEPROM byte reg for r4k */
+	__u32 _unused5;
+	volatile __u32 eeprom;	/* EEPROM byte reg for r4k */
 #define SGIMC_EEPROM_PRE	0x00000001 /* eeprom chip PRE pin assertion */
 #define SGIMC_EEPROM_CSEL	0x00000002 /* Active high, eeprom chip select */
 #define SGIMC_EEPROM_SECLOCK	0x00000004 /* EEPROM serial clock */
 #define SGIMC_EEPROM_SDATAO	0x00000008 /* Serial EEPROM data-out */
 #define SGIMC_EEPROM_SDATAI	0x00000010 /* Serial EEPROM data-in */
 
-	u32 _unused6[3];
-	volatile u32 rcntpre;	/* Preload refresh counter */
+	__u32 _unused6[3];
+	volatile __u32 rcntpre;	/* Preload refresh counter */
 
-	u32 _unused7;
-	volatile u32 rcounter;	/* Readonly refresh counter */
+	__u32 _unused7;
+	volatile __u32 rcounter;	/* Readonly refresh counter */
 
-	u32 _unused8[13];
-	volatile u32 giopar;	/* Parameter word for GIO64 */
+	__u32 _unused8[13];
+	volatile __u32 giopar;	/* Parameter word for GIO64 */
 #define SGIMC_GIOPAR_HPC64	0x00000001 /* HPC talks to GIO using 64-bits */
 #define SGIMC_GIOPAR_GFX64	0x00000002 /* GFX talks to GIO using 64-bits */
 #define SGIMC_GIOPAR_EXP064	0x00000004 /* EXP(slot0) talks using 64-bits */
@@ -89,36 +89,36 @@
 #define SGIMC_GIOPAR_PLINEEXP0	0x00004000 /* EXP(slot0) has pipeline attr */
 #define SGIMC_GIOPAR_PLINEEXP1	0x00008000 /* EXP(slot1) has pipeline attr */
 
-	u32 _unused9;
-	volatile u32 cputp;	/* CPU bus arb time period */
+	__u32 _unused9;
+	volatile __u32 cputp;	/* CPU bus arb time period */
 
-	u32 _unused10[3];
-	volatile u32 lbursttp;	/* Time period for long bursts */
+	__u32 _unused10[3];
+	volatile __u32 lbursttp;	/* Time period for long bursts */
 
 	/* MC chip can drive up to 4 bank 4 SIMMs each. All SIMMs in bank must
 	 * be the same size. The size encoding for supported SIMMs is bellow */
-	u32 _unused11[9];
-	volatile u32 mconfig0;	/* Memory config register zero */
-	u32 _unused12;
-	volatile u32 mconfig1;	/* Memory config register one */
+	__u32 _unused11[9];
+	volatile __u32 mconfig0;	/* Memory config register zero */
+	__u32 _unused12;
+	volatile __u32 mconfig1;	/* Memory config register one */
 #define SGIMC_MCONFIG_BASEADDR	0x000000ff /* Base address of bank*/
 #define SGIMC_MCONFIG_RMASK	0x00001f00 /* Ram config bitmask */
 #define SGIMC_MCONFIG_BVALID	0x00002000 /* Bank is valid */
 #define SGIMC_MCONFIG_SBANKS	0x00004000 /* Number of subbanks */
 
-	u32 _unused13;
-	volatile u32 cmacc;        /* Mem access config for CPU */
-	u32 _unused14;
-	volatile u32 gmacc;        /* Mem access config for GIO */
+	__u32 _unused13;
+	volatile __u32 cmacc;        /* Mem access config for CPU */
+	__u32 _unused14;
+	volatile __u32 gmacc;        /* Mem access config for GIO */
 
 	/* This define applies to both cmacc and gmacc registers above. */
 #define SGIMC_MACC_ALIASBIG	0x20000000 /* 512MB home for alias */
 
 	/* Error address/status regs from GIO and CPU perspectives. */
-	u32 _unused15;
-	volatile u32 cerr;	/* Error address reg for CPU */
-	u32 _unused16;
-	volatile u32 cstat;	/* Status reg for CPU */
+	__u32 _unused15;
+	volatile __u32 cerr;	/* Error address reg for CPU */
+	__u32 _unused16;
+	volatile __u32 cstat;	/* Status reg for CPU */
 #define SGIMC_CSTAT_RD		0x00000100 /* read parity error */
 #define SGIMC_CSTAT_PAR		0x00000200 /* CPU parity error */
 #define SGIMC_CSTAT_ADDR	0x00000400 /* memory bus error bad addr */
@@ -128,10 +128,10 @@
 #define SGIMC_CSTAT_PAR_MASK	0x00001f00 /* parity error mask */
 #define SGIMC_CSTAT_RD_PAR	(SGIMC_CSTAT_RD | SGIMC_CSTAT_PAR)
 
-	u32 _unused17;
-	volatile u32 gerr;	/* Error address reg for GIO */
-	u32 _unused18;
-	volatile u32 gstat;	/* Status reg for GIO */
+	__u32 _unused17;
+	volatile __u32 gerr;	/* Error address reg for GIO */
+	__u32 _unused18;
+	volatile __u32 gstat;	/* Status reg for GIO */
 #define SGIMC_GSTAT_RD		0x00000100 /* read parity error */
 #define SGIMC_GSTAT_WR		0x00000200 /* write parity error */
 #define SGIMC_GSTAT_TIME	0x00000400 /* GIO bus timed out */
@@ -142,76 +142,76 @@
 #define SGIMC_GSTAT_PIO_WR	0x00008000 /* write data parity on pio */
 
 	/* Special hard bus locking registers. */
-	u32 _unused19;
-	volatile u32 syssembit;		/* Uni-bit system semaphore */
-	u32 _unused20;
-	volatile u32 mlock;		/* Global GIO memory access lock */
-	u32 _unused21;
-	volatile u32 elock;		/* Locks EISA from GIO accesses */
+	__u32 _unused19;
+	volatile __u32 syssembit;	/* Uni-bit system semaphore */
+	__u32 _unused20;
+	volatile __u32 mlock;		/* Global GIO memory access lock */
+	__u32 _unused21;
+	volatile __u32 elock;		/* Locks EISA from GIO accesses */
 
 	/* GIO dma control registers. */
-	u32 _unused22[15];
-	volatile u32 gio_dma_trans;	/* DMA mask to translation GIO addrs */
-	u32 _unused23;
-	volatile u32 gio_dma_sbits;	/* DMA GIO addr substitution bits */
-	u32 _unused24;
-	volatile u32 dma_intr_cause;	/* DMA IRQ cause indicator bits */
-	u32 _unused25;
-	volatile u32 dma_ctrl;		/* Main DMA control reg */
+	__u32 _unused22[15];
+	volatile __u32 gio_dma_trans;	/* DMA mask to translation GIO addrs */
+	__u32 _unused23;
+	volatile __u32 gio_dma_sbits;	/* DMA GIO addr substitution bits */
+	__u32 _unused24;
+	volatile __u32 dma_intr_cause;	/* DMA IRQ cause indicator bits */
+	__u32 _unused25;
+	volatile __u32 dma_ctrl;	/* Main DMA control reg */
 
 	/* DMA TLB entry 0 */
-	u32 _unused26[5];
-	volatile u32 dtlb_hi0;
-	u32 _unused27;
-	volatile u32 dtlb_lo0;
+	__u32 _unused26[5];
+	volatile __u32 dtlb_hi0;
+	__u32 _unused27;
+	volatile __u32 dtlb_lo0;
 
 	/* DMA TLB entry 1 */
-	u32 _unused28;
-	volatile u32 dtlb_hi1;
-	u32 _unused29;
-	volatile u32 dtlb_lo1;
+	__u32 _unused28;
+	volatile __u32 dtlb_hi1;
+	__u32 _unused29;
+	volatile __u32 dtlb_lo1;
 
 	/* DMA TLB entry 2 */
-	u32 _unused30;
-	volatile u32 dtlb_hi2;
-	u32 _unused31;
-	volatile u32 dtlb_lo2;
+	__u32 _unused30;
+	volatile __u32 dtlb_hi2;
+	__u32 _unused31;
+	volatile __u32 dtlb_lo2;
 
 	/* DMA TLB entry 3 */
-	u32 _unused32;
-	volatile u32 dtlb_hi3;
-	u32 _unused33;
-	volatile u32 dtlb_lo3;
+	__u32 _unused32;
+	volatile __u32 dtlb_hi3;
+	__u32 _unused33;
+	volatile __u32 dtlb_lo3;
 	
-	u32 _unused34[0x0392];
+	__u32 _unused34[0x0392];
 	
-	u32 _unused35;
-	volatile u32 rpsscounter;	/* Chirps at 100ns */
+	__u32 _unused35;
+	volatile __u32 rpsscounter;	/* Chirps at 100ns */
 
-	u32 _unused36[0x1000/4-2*4];
+	__u32 _unused36[0x1000/4-2*4];
 	
-	u32 _unused37;
-	volatile u32 maddronly;		/* Address DMA goes at */
-	u32 _unused38;
-	volatile u32 maddrpdeflts;	/* Same as above, plus set defaults */
-	u32 _unused39;
-	volatile u32 dmasz;		/* DMA count */
-	u32 _unused40;
-	volatile u32 ssize;		/* DMA stride size */
-	u32 _unused41;
-	volatile u32 gmaddronly;	/* Set GIO DMA but don't start trans */
-	u32 _unused42;
-	volatile u32 dmaddnpgo;		/* Set GIO DMA addr + start transfer */
-	u32 _unused43;
-	volatile u32 dmamode;		/* DMA mode config bit settings */
-	u32 _unused44;
-	volatile u32 dmaccount;		/* Zoom and byte count for DMA */
-	u32 _unused45;
-	volatile u32 dmastart;		/* Pedal to the metal. */
-	u32 _unused46;
-	volatile u32 dmarunning;	/* DMA op is in progress */
-	u32 _unused47;
-	volatile u32 maddrdefstart;	/* Set dma addr, defaults, and kick it */
+	__u32 _unused37;
+	volatile __u32 maddronly;	/* Address DMA goes at */
+	__u32 _unused38;
+	volatile __u32 maddrpdeflts;	/* Same as above, plus set defaults */
+	__u32 _unused39;
+	volatile __u32 dmasz;		/* DMA count */
+	__u32 _unused40;
+	volatile __u32 ssize;		/* DMA stride size */
+	__u32 _unused41;
+	volatile __u32 gmaddronly;	/* Set GIO DMA but don't start trans */
+	__u32 _unused42;
+	volatile __u32 dmaddnpgo;	/* Set GIO DMA addr + start transfer */
+	__u32 _unused43;
+	volatile __u32 dmamode;		/* DMA mode config bit settings */
+	__u32 _unused44;
+	volatile __u32 dmaccount;	/* Zoom and byte count for DMA */
+	__u32 _unused45;
+	volatile __u32 dmastart;	/* Pedal to the metal. */
+	__u32 _unused46;
+	volatile __u32 dmarunning;	/* DMA op is in progress */
+	__u32 _unused47;
+	volatile __u32 maddrdefstart;	/* Set dma addr, defaults, and kick it */
 };
 
 extern struct sgimc_regs *sgimc;
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/sgiarcs.h linux-libc-headers-2.6.8.0/include/asm-mips/sgiarcs.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sgiarcs.h	2004-03-28 07:51:52.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/sgiarcs.h	2004-08-26 05:21:53.000000000 -0500
@@ -164,11 +164,11 @@
 /* This prom has a bolixed design. */
 struct linux_bigint {
 #ifdef __MIPSEL__
-	u32 lo;
-	s32 hi;
+	__u32 lo;
+	__s32 hi;
 #else /* !(__MIPSEL__) */
-	s32 hi;
-	u32 lo;
+	__s32 hi;
+	__u32 lo;
 #endif
 };
 
@@ -366,7 +366,7 @@
  * Macros for calling a 32-bit ARC implementation from 64-bit code
  */
 
-#if defined(CONFIG_MIPS64) && defined(CONFIG_ARC32)
+#if defined(__mips64) && defined(CONFIG_ARC32)
 
 #define __arc_clobbers							\
 	"$2","$3" /* ... */, "$8","$9","$10","$11",			\
@@ -475,10 +475,10 @@
 	__res;								\
 })
 
-#endif /* defined(CONFIG_MIPS64) && defined(CONFIG_ARC32) */
+#endif /* defined(__mips64) && defined(CONFIG_ARC32) */
 
-#if (defined(CONFIG_MIPS32) && defined(CONFIG_ARC32)) ||		\
-    (defined(CONFIG_MIPS64) && defined(CONFIG_ARC64))
+#if (!defined(__mips64) && defined(CONFIG_ARC32)) ||		\
+    (defined(__mips64) && defined(CONFIG_ARC64))
 
 #define ARC_CALL0(dest)							\
 ({	long __res;							\
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/siginfo.h linux-libc-headers-2.6.8.0/include/asm-mips/siginfo.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/siginfo.h	2004-06-09 07:00:41.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/asm-mips/siginfo.h	2004-08-26 05:14:41.000000000 -0500
@@ -66,10 +66,10 @@
 
 		/* SIGPOLL, SIGXFSZ (To do ...)  */
 		struct {
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
 			int _band;	/* POLL_IN, POLL_OUT, POLL_MSG */
 #endif
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
 			long _band;	/* POLL_IN, POLL_OUT, POLL_MSG */
 #endif
 			int _fd;
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/sim.h linux-libc-headers-2.6.8.0/include/asm-mips/sim.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sim.h	2004-03-28 07:51:52.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/sim.h	2004-08-26 05:17:16.000000000 -0500
@@ -18,7 +18,7 @@
 #define __str2(x) #x
 #define __str(x) __str2(x)
 
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
 
 #define save_static_function(symbol)					\
 __asm__ (								\
@@ -43,9 +43,9 @@
 
 #define nabi_no_regargs
 
-#endif /* CONFIG_MIPS32 */
+#endif /* ndef __mips64 */
 
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
 
 #define save_static_function(symbol)					\
 __asm__ (								\
@@ -78,6 +78,6 @@
 	unsigned long __dummy6,						\
 	unsigned long __dummy7,
 
-#endif /* CONFIG_MIPS64 */
+#endif /* __mips64 */
 
 #endif /* _ASM_SIM_H */
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/arch.h linux-libc-headers-2.6.8.0/include/asm-mips/sn/arch.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/arch.h	2004-06-09 07:00:42.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/asm-mips/sn/arch.h	2004-08-26 05:26:16.000000000 -0500
@@ -17,8 +17,8 @@
 #include <asm/sn/sn0/arch.h>
 #endif
 
-typedef u64	hubreg_t;
-typedef u64	nic_t;
+typedef __u64	hubreg_t;
+typedef __u64	nic_t;
 
 #define cputonasid(cpu)			(cpu_data[(cpu)].p_nasid)
 #define cputoslice(cpu)			(cpu_data[(cpu)].p_slice)
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/gda.h linux-libc-headers-2.6.8.0/include/asm-mips/sn/gda.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/gda.h	2003-12-15 12:47:02.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/sn/gda.h	2004-08-26 05:26:30.000000000 -0500
@@ -44,11 +44,11 @@
 #ifndef __ASSEMBLY__
 
 typedef struct gda {
-	u32	g_magic;	/* GDA magic number */
-	u16	g_version;	/* Version of this structure */
-	u16	g_masterid;	/* The NASID:CPUNUM of the master cpu */
-	u32	g_promop;	/* Passes requests from the kernel to prom */
-	u32	g_vds;		/* Store the virtual dipswitches here */
+	__u32	g_magic;	/* GDA magic number */
+	__u16	g_version;	/* Version of this structure */
+	__u16	g_masterid;	/* The NASID:CPUNUM of the master cpu */
+	__u32	g_promop;	/* Passes requests from the kernel to prom */
+	__u32	g_vds;		/* Store the virtual dipswitches here */
 	void	**g_hooked_norm;/* ptr to pda loc for norm hndlr */
 	void	**g_hooked_utlb;/* ptr to pda loc for utlb hndlr */
 	void	**g_hooked_xtlb;/* ptr to pda loc for xtlb hndlr */
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/ioc3.h linux-libc-headers-2.6.8.0/include/asm-mips/sn/ioc3.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/ioc3.h	2003-12-15 12:47:02.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/sn/ioc3.h	2004-08-26 05:26:06.000000000 -0500
@@ -8,23 +8,23 @@
 /* SUPERIO uart register map */
 typedef volatile struct ioc3_uartregs {
 	union {
-		volatile u8	rbr;	/* read only, DLAB == 0 */
-		volatile u8	thr;	/* write only, DLAB == 0 */
-		volatile u8	dll;	/* DLAB == 1 */
+		volatile __u8	rbr;	/* read only, DLAB == 0 */
+		volatile __u8	thr;	/* write only, DLAB == 0 */
+		volatile __u8	dll;	/* DLAB == 1 */
 	} u1;
 	union {
-		volatile u8	ier;	/* DLAB == 0 */
-		volatile u8	dlm;	/* DLAB == 1 */
+		volatile __u8	ier;	/* DLAB == 0 */
+		volatile __u8	dlm;	/* DLAB == 1 */
 	} u2;
 	union {
-		volatile u8	iir;	/* read only */
-		volatile u8	fcr;	/* write only */
+		volatile __u8	iir;	/* read only */
+		volatile __u8	fcr;	/* write only */
 	} u3;
-	volatile u8	    iu_lcr;
-	volatile u8	    iu_mcr;
-	volatile u8	    iu_lsr;
-	volatile u8	    iu_msr;
-	volatile u8	    iu_scr;
+	volatile __u8	    iu_lcr;
+	volatile __u8	    iu_mcr;
+	volatile __u8	    iu_lsr;
+	volatile __u8	    iu_msr;
+	volatile __u8	    iu_scr;
 } ioc3_uregs_t;
 
 #define iu_rbr u1.rbr
@@ -36,29 +36,29 @@
 #define iu_fcr u3.fcr
 
 struct ioc3_sioregs {
-	volatile u8		fill[0x141];	/* starts at 0x141 */
+	volatile __u8		fill[0x141];	/* starts at 0x141 */
 
-	volatile u8		uartc;
-	volatile u8		kbdcg;
+	volatile __u8		uartc;
+	volatile __u8		kbdcg;
 
-	volatile u8		fill0[0x150 - 0x142 - 1];
+	volatile __u8		fill0[0x150 - 0x142 - 1];
 
-	volatile u8		pp_data;
-	volatile u8		pp_dsr;
-	volatile u8		pp_dcr;
+	volatile __u8		pp_data;
+	volatile __u8		pp_dsr;
+	volatile __u8		pp_dcr;
 
-	volatile u8		fill1[0x158 - 0x152 - 1];
+	volatile __u8		fill1[0x158 - 0x152 - 1];
 
-	volatile u8		pp_fifa;
-	volatile u8		pp_cfgb;
-	volatile u8		pp_ecr;
+	volatile __u8		pp_fifa;
+	volatile __u8		pp_cfgb;
+	volatile __u8		pp_ecr;
 
-	volatile u8		fill2[0x168 - 0x15a - 1];
+	volatile __u8		fill2[0x168 - 0x15a - 1];
 
-	volatile u8		rtcad;
-	volatile u8		rtcdat;
+	volatile __u8		rtcad;
+	volatile __u8		rtcdat;
 
-	volatile u8		fill3[0x170 - 0x169 - 1];
+	volatile __u8		fill3[0x170 - 0x169 - 1];
 
 	struct ioc3_uartregs    uartb;	/* 0x20170  */
 	struct ioc3_uartregs    uarta;	/* 0x20178  */
@@ -66,103 +66,103 @@
 
 /* Register layout of IOC3 in configuration space.  */
 struct ioc3 {
-	volatile u32	pad0[7];	/* 0x00000  */
-	volatile u32	sio_ir;		/* 0x0001c  */
-	volatile u32	sio_ies;	/* 0x00020  */
-	volatile u32	sio_iec;	/* 0x00024  */
-	volatile u32	sio_cr;		/* 0x00028  */
-	volatile u32	int_out;	/* 0x0002c  */
-	volatile u32	mcr;		/* 0x00030  */
+	volatile __u32	pad0[7];	/* 0x00000  */
+	volatile __u32	sio_ir;		/* 0x0001c  */
+	volatile __u32	sio_ies;	/* 0x00020  */
+	volatile __u32	sio_iec;	/* 0x00024  */
+	volatile __u32	sio_cr;		/* 0x00028  */
+	volatile __u32	int_out;	/* 0x0002c  */
+	volatile __u32	mcr;		/* 0x00030  */
 
 	/* General Purpose I/O registers  */
-	volatile u32	gpcr_s;		/* 0x00034  */
-	volatile u32	gpcr_c;		/* 0x00038  */
-	volatile u32	gpdr;		/* 0x0003c  */
-	volatile u32	gppr_0;		/* 0x00040  */
-	volatile u32	gppr_1;		/* 0x00044  */
-	volatile u32	gppr_2;		/* 0x00048  */
-	volatile u32	gppr_3;		/* 0x0004c  */
-	volatile u32	gppr_4;		/* 0x00050  */
-	volatile u32	gppr_5;		/* 0x00054  */
-	volatile u32	gppr_6;		/* 0x00058  */
-	volatile u32	gppr_7;		/* 0x0005c  */
-	volatile u32	gppr_8;		/* 0x00060  */
-	volatile u32	gppr_9;		/* 0x00064  */
-	volatile u32	gppr_10;	/* 0x00068  */
-	volatile u32	gppr_11;	/* 0x0006c  */
-	volatile u32	gppr_12;	/* 0x00070  */
-	volatile u32	gppr_13;	/* 0x00074  */
-	volatile u32	gppr_14;	/* 0x00078  */
-	volatile u32	gppr_15;	/* 0x0007c  */
+	volatile __u32	gpcr_s;		/* 0x00034  */
+	volatile __u32	gpcr_c;		/* 0x00038  */
+	volatile __u32	gpdr;		/* 0x0003c  */
+	volatile __u32	gppr_0;		/* 0x00040  */
+	volatile __u32	gppr_1;		/* 0x00044  */
+	volatile __u32	gppr_2;		/* 0x00048  */
+	volatile __u32	gppr_3;		/* 0x0004c  */
+	volatile __u32	gppr_4;		/* 0x00050  */
+	volatile __u32	gppr_5;		/* 0x00054  */
+	volatile __u32	gppr_6;		/* 0x00058  */
+	volatile __u32	gppr_7;		/* 0x0005c  */
+	volatile __u32	gppr_8;		/* 0x00060  */
+	volatile __u32	gppr_9;		/* 0x00064  */
+	volatile __u32	gppr_10;	/* 0x00068  */
+	volatile __u32	gppr_11;	/* 0x0006c  */
+	volatile __u32	gppr_12;	/* 0x00070  */
+	volatile __u32	gppr_13;	/* 0x00074  */
+	volatile __u32	gppr_14;	/* 0x00078  */
+	volatile __u32	gppr_15;	/* 0x0007c  */
 
 	/* Parallel Port Registers  */
-	volatile u32	ppbr_h_a;	/* 0x00080  */
-	volatile u32	ppbr_l_a;	/* 0x00084  */
-	volatile u32	ppcr_a;		/* 0x00088  */
-	volatile u32	ppcr;		/* 0x0008c  */
-	volatile u32	ppbr_h_b;	/* 0x00090  */
-	volatile u32	ppbr_l_b;	/* 0x00094  */
-	volatile u32	ppcr_b;		/* 0x00098  */
+	volatile __u32	ppbr_h_a;	/* 0x00080  */
+	volatile __u32	ppbr_l_a;	/* 0x00084  */
+	volatile __u32	ppcr_a;		/* 0x00088  */
+	volatile __u32	ppcr;		/* 0x0008c  */
+	volatile __u32	ppbr_h_b;	/* 0x00090  */
+	volatile __u32	ppbr_l_b;	/* 0x00094  */
+	volatile __u32	ppcr_b;		/* 0x00098  */
 
 	/* Keyboard and Mouse Registers  */
-	volatile u32	km_csr;		/* 0x0009c  */
-	volatile u32	k_rd;		/* 0x000a0  */
-	volatile u32	m_rd;		/* 0x000a4  */
-	volatile u32	k_wd;		/* 0x000a8  */
-	volatile u32	m_wd;		/* 0x000ac  */
+	volatile __u32	km_csr;		/* 0x0009c  */
+	volatile __u32	k_rd;		/* 0x000a0  */
+	volatile __u32	m_rd;		/* 0x000a4  */
+	volatile __u32	k_wd;		/* 0x000a8  */
+	volatile __u32	m_wd;		/* 0x000ac  */
 
 	/* Serial Port Registers  */
-	volatile u32	sbbr_h;		/* 0x000b0  */
-	volatile u32	sbbr_l;		/* 0x000b4  */
-	volatile u32	sscr_a;		/* 0x000b8  */
-	volatile u32	stpir_a;	/* 0x000bc  */
-	volatile u32	stcir_a;	/* 0x000c0  */
-	volatile u32	srpir_a;	/* 0x000c4  */
-	volatile u32	srcir_a;	/* 0x000c8  */
-	volatile u32	srtr_a;		/* 0x000cc  */
-	volatile u32	shadow_a;	/* 0x000d0  */
-	volatile u32	sscr_b;		/* 0x000d4  */
-	volatile u32	stpir_b;	/* 0x000d8  */
-	volatile u32	stcir_b;	/* 0x000dc  */
-	volatile u32	srpir_b;	/* 0x000e0  */
-	volatile u32	srcir_b;	/* 0x000e4  */
-	volatile u32	srtr_b;		/* 0x000e8  */
-	volatile u32	shadow_b;	/* 0x000ec  */
+	volatile __u32	sbbr_h;		/* 0x000b0  */
+	volatile __u32	sbbr_l;		/* 0x000b4  */
+	volatile __u32	sscr_a;		/* 0x000b8  */
+	volatile __u32	stpir_a;	/* 0x000bc  */
+	volatile __u32	stcir_a;	/* 0x000c0  */
+	volatile __u32	srpir_a;	/* 0x000c4  */
+	volatile __u32	srcir_a;	/* 0x000c8  */
+	volatile __u32	srtr_a;		/* 0x000cc  */
+	volatile __u32	shadow_a;	/* 0x000d0  */
+	volatile __u32	sscr_b;		/* 0x000d4  */
+	volatile __u32	stpir_b;	/* 0x000d8  */
+	volatile __u32	stcir_b;	/* 0x000dc  */
+	volatile __u32	srpir_b;	/* 0x000e0  */
+	volatile __u32	srcir_b;	/* 0x000e4  */
+	volatile __u32	srtr_b;		/* 0x000e8  */
+	volatile __u32	shadow_b;	/* 0x000ec  */
 
 	/* Ethernet Registers  */
-	volatile u32	emcr;		/* 0x000f0  */
-	volatile u32	eisr;		/* 0x000f4  */
-	volatile u32	eier;		/* 0x000f8  */
-	volatile u32	ercsr;		/* 0x000fc  */
-	volatile u32	erbr_h;		/* 0x00100  */
-	volatile u32	erbr_l;		/* 0x00104  */
-	volatile u32	erbar;		/* 0x00108  */
-	volatile u32	ercir;		/* 0x0010c  */
-	volatile u32	erpir;		/* 0x00110  */
-	volatile u32	ertr;		/* 0x00114  */
-	volatile u32	etcsr;		/* 0x00118  */
-	volatile u32	ersr;		/* 0x0011c  */
-	volatile u32	etcdc;		/* 0x00120  */
-	volatile u32	ebir;		/* 0x00124  */
-	volatile u32	etbr_h;		/* 0x00128  */
-	volatile u32	etbr_l;		/* 0x0012c  */
-	volatile u32	etcir;		/* 0x00130  */
-	volatile u32	etpir;		/* 0x00134  */
-	volatile u32	emar_h;		/* 0x00138  */
-	volatile u32	emar_l;		/* 0x0013c  */
-	volatile u32	ehar_h;		/* 0x00140  */
-	volatile u32	ehar_l;		/* 0x00144  */
-	volatile u32	micr;		/* 0x00148  */
-	volatile u32	midr_r;		/* 0x0014c  */
-	volatile u32	midr_w;		/* 0x00150  */
-	volatile u32	pad1[(0x20000 - 0x00154) / 4];
+	volatile __u32	emcr;		/* 0x000f0  */
+	volatile __u32	eisr;		/* 0x000f4  */
+	volatile __u32	eier;		/* 0x000f8  */
+	volatile __u32	ercsr;		/* 0x000fc  */
+	volatile __u32	erbr_h;		/* 0x00100  */
+	volatile __u32	erbr_l;		/* 0x00104  */
+	volatile __u32	erbar;		/* 0x00108  */
+	volatile __u32	ercir;		/* 0x0010c  */
+	volatile __u32	erpir;		/* 0x00110  */
+	volatile __u32	ertr;		/* 0x00114  */
+	volatile __u32	etcsr;		/* 0x00118  */
+	volatile __u32	ersr;		/* 0x0011c  */
+	volatile __u32	etcdc;		/* 0x00120  */
+	volatile __u32	ebir;		/* 0x00124  */
+	volatile __u32	etbr_h;		/* 0x00128  */
+	volatile __u32	etbr_l;		/* 0x0012c  */
+	volatile __u32	etcir;		/* 0x00130  */
+	volatile __u32	etpir;		/* 0x00134  */
+	volatile __u32	emar_h;		/* 0x00138  */
+	volatile __u32	emar_l;		/* 0x0013c  */
+	volatile __u32	ehar_h;		/* 0x00140  */
+	volatile __u32	ehar_l;		/* 0x00144  */
+	volatile __u32	micr;		/* 0x00148  */
+	volatile __u32	midr_r;		/* 0x0014c  */
+	volatile __u32	midr_w;		/* 0x00150  */
+	volatile __u32	pad1[(0x20000 - 0x00154) / 4];
 
 	/* SuperIO Registers  XXX */
 	struct ioc3_sioregs	sregs;	/* 0x20000 */
-	volatile u32	pad2[(0x40000 - 0x20180) / 4];
+	volatile __u32	pad2[(0x40000 - 0x20180) / 4];
 
 	/* SSRAM Diagnostic Access */
-	volatile u32	ssram[(0x80000 - 0x40000) / 4];
+	volatile __u32	ssram[(0x80000 - 0x40000) / 4];
 
 	/* Bytebus device offsets
 	   0x80000 -   Access to the generic devices selected with   DEV0
@@ -179,8 +179,8 @@
  * Ethernet RX Buffer
  */
 struct ioc3_erxbuf {
-	u32	w0;			/* first word (valid,bcnt,cksum) */
-	u32	err;			/* second word various errors */
+	__u32	w0;			/* first word (valid,bcnt,cksum) */
+	__u32	err;			/* second word various errors */
 	/* next comes n bytes of padding */
 	/* then the received ethernet frame itself */
 };
@@ -208,11 +208,11 @@
  */
 #define ETXD_DATALEN    104
 struct ioc3_etxd {
-	u32	cmd;				/* command field */
-	u32	bufcnt;				/* buffer counts field */
-	u64	p1;				/* buffer pointer 1 */
-	u64	p2;				/* buffer pointer 2 */
-	u8	data[ETXD_DATALEN];		/* opt. tx data */
+	__u32	cmd;				/* command field */
+	__u32	bufcnt;				/* buffer counts field */
+	__u64	p1;				/* buffer pointer 1 */
+	__u64	p2;				/* buffer pointer 2 */
+	__u8	data[ETXD_DATALEN];		/* opt. tx data */
 };
 
 #define ETXD_BYTECNT_MASK	0x000007ff	/* total byte count */
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/klconfig.h linux-libc-headers-2.6.8.0/include/asm-mips/sn/klconfig.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/klconfig.h	2004-03-28 07:51:55.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/sn/klconfig.h	2004-08-26 05:26:13.000000000 -0500
@@ -64,9 +64,9 @@
 #define KLCFGINFO_MAGIC	0xbeedbabe
 
 #ifdef FRUTEST
-typedef u64 klconf_off_t;
+typedef __u64 klconf_off_t;
 #else
-typedef s32 klconf_off_t;
+typedef __s32 klconf_off_t;
 #endif
 
 /*
@@ -160,8 +160,8 @@
 /* Functions/macros needed to use this structure */
 
 typedef struct kl_config_hdr {
-	u64		ch_magic;	/* set this to KLCFGINFO_MAGIC */
-	u32		ch_version;    /* structure version number */
+	__u64		ch_magic;	/* set this to KLCFGINFO_MAGIC */
+	__u32		ch_version;    /* structure version number */
 	klconf_off_t	ch_malloc_hdr_off; /* offset of ch_malloc_hdr */
 	klconf_off_t	ch_cons_off;       /* offset of ch_cons */
 	klconf_off_t	ch_board_info;	/* the link list of boards */
@@ -609,14 +609,14 @@
 
 /* Info holders for various hardware components */
 
-typedef u64 *pci_t;
-typedef u64 *vmeb_t;
-typedef u64 *vmed_t;
-typedef u64 *fddi_t;
-typedef u64 *scsi_t;
-typedef u64 *mio_t;
-typedef u64 *graphics_t;
-typedef u64 *router_t;
+typedef __u64 *pci_t;
+typedef __u64 *vmeb_t;
+typedef __u64 *vmed_t;
+typedef __u64 *fddi_t;
+typedef __u64 *scsi_t;
+typedef __u64 *mio_t;
+typedef __u64 *graphics_t;
+typedef __u64 *router_t;
 
 /*
  * The port info in ip27_cfg area translates to a lboart_t in the
@@ -659,7 +659,7 @@
 	klport_t	hub_port;		/* hub is connected to this */
 	nic_t		hub_box_nic;		/* nic of containing box */
 	klconf_off_t	hub_mfg_nic;		/* MFG NIC string */
-	u64		hub_speed;		/* Speed of hub in HZ */
+	__u64		hub_speed;		/* Speed of hub in HZ */
 } klhub_t ;
 
 typedef struct klhub_uart_s {			/* HUB */
@@ -716,8 +716,8 @@
 #define MAX_PCI_SLOTS 8
 
 typedef struct klpci_device_s {
-	s32	pci_device_id;	/* 32 bits of vendor/device ID. */
-	s32	pci_device_pad;	/* 32 bits of padding. */
+	__s32	pci_device_id;	/* 32 bits of vendor/device ID. */
+	__s32	pci_device_pad;	/* 32 bits of padding. */
 } klpci_device_t;
 
 #define BRIDGE_STRUCT_VERSION	2
@@ -767,7 +767,7 @@
 	nic_t		rou_box_nic ;         /* nic of the containing module */
     	klport_t 	rou_port[MAX_ROUTER_PORTS + 1] ; /* array index 1 to 6 */
 	klconf_off_t	rou_mfg_nic ;     /* MFG NIC string */
-	u64	rou_vector;	  /* vector from master node */
+	__u64	rou_vector;	  /* vector from master node */
 } klrou_t ;
 
 /*
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/kldir.h linux-libc-headers-2.6.8.0/include/asm-mips/sn/kldir.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/kldir.h	2004-01-17 17:03:49.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/sn/kldir.h	2004-08-26 05:26:25.000000000 -0500
@@ -210,7 +210,7 @@
 
 #ifndef __ASSEMBLY__
 typedef struct kldir_ent_s {
-	u64		magic;		/* Indicates validity of entry      */
+	__u64		magic;		/* Indicates validity of entry      */
 	off_t		offset;		/* Offset from start of node space  */
 #if defined(CONFIG_SGI_IO)	/* FIXME */
 	__psunsigned_t	pointer;	/* Pointer to area in some cases    */
@@ -218,7 +218,7 @@
 	unsigned long	pointer;	/* Pointer to area in some cases    */
 #endif
 	size_t		size;		/* Size in bytes 		    */
-	u64		count;		/* Repeat count if array, 1 if not  */
+	__u64		count;		/* Repeat count if array, 1 if not  */
 	size_t		stride;		/* Stride if array, 0 if not        */
 	char		rsvd[16];	/* Pad entry to 0x40 bytes          */
 	/* NOTE: These 16 bytes are used in the Partition KLDIR
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/launch.h linux-libc-headers-2.6.8.0/include/asm-mips/sn/launch.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/launch.h	2004-01-17 17:03:49.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/sn/launch.h	2004-08-26 05:25:52.000000000 -0500
@@ -62,14 +62,14 @@
 #ifndef __ASSEMBLY__
 
 typedef int launch_state_t;
-typedef void (*launch_proc_t)(u64 call_parm);
+typedef void (*launch_proc_t)(__u64 call_parm);
 
 typedef struct launch_s {
-	volatile u64		magic;	/* Magic number                     */
-	volatile u64		busy;	/* Slave currently active           */
+	volatile __u64		magic;	/* Magic number                     */
+	volatile __u64		busy;	/* Slave currently active           */
 	volatile launch_proc_t	call_addr;	/* Func. for slave to call  */
-	volatile u64		call_addr_c;	/* 1's complement of call_addr*/
-	volatile u64		call_parm;	/* Single parm passed to call*/
+	volatile __u64		call_addr_c;	/* 1's complement of call_addr*/
+	volatile __u64		call_parm;	/* Single parm passed to call*/
 	volatile void *stack_addr;	/* Stack pointer for slave function */
 	volatile void *gp_addr;		/* Global pointer for slave func.   */
 	volatile char 		*bevutlb;/* Address of bev utlb ex handler   */
@@ -84,7 +84,7 @@
 
 #define LAUNCH_SLAVE	(*(void (*)(int nasid, int cpu, \
 				    launch_proc_t call_addr, \
-				    u64 call_parm, \
+				    __u64 call_parm, \
 				    void *stack_addr, \
 				    void *gp_addr)) \
 			 IP27PROM_LAUNCHSLAVE)
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/sn0/hubio.h linux-libc-headers-2.6.8.0/include/asm-mips/sn/sn0/hubio.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/sn0/hubio.h	2003-12-15 12:47:02.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/sn/sn0/hubio.h	2004-08-26 05:27:21.000000000 -0500
@@ -172,9 +172,9 @@
 #ifndef __ASSEMBLY__
 
 typedef union hubii_wid_u {
-	u64	wid_reg_value;
+	__u64	wid_reg_value;
 	struct {
-		u64 	wid_rsvd: 	32,	/* unused */
+		__u64 	wid_rsvd: 	32,	/* unused */
                    	wid_rev_num:	 4,	/* revision number */
                    	wid_part_num:	16,	/* the widget type: hub=c101 */
                    	wid_mfg_num:	11,	/* Manufacturer id (IBM) */
@@ -184,9 +184,9 @@
 
 
 typedef union hubii_wcr_u {
-	u64	wcr_reg_value;
+	__u64	wcr_reg_value;
 	struct {
-		u64 	wcr_rsvd: 	41,	/* unused */
+		__u64 	wcr_rsvd: 	41,	/* unused */
                    	wcr_e_thresh:	 5,	/* elasticity threshold */
 			wcr_dir_con:	 1,	/* widget direct connect */
                    	wcr_f_bad_pkt:	 1,	/* Force bad llp pkt enable */
@@ -200,9 +200,9 @@
 #define	iwcr_dir_con	wcr_fields_s.wcr_dir_con
 
 typedef union hubii_wstat_u {
-	u64      reg_value;
+	__u64      reg_value;
 	struct {
-		u64	rsvd1:		31,
+		__u64	rsvd1:		31,
 			crazy:		 1,	/* Crazy bit		*/
 			rsvd2:		 8,
 			llp_tx_cnt:	 8, 	/* LLP Xmit retry counter */
@@ -217,9 +217,9 @@
 
 
 typedef union hubii_ilcsr_u {
-	u64	icsr_reg_value;
+	__u64	icsr_reg_value;
 	struct {
-		u64 	icsr_rsvd: 	22,	/* unused */
+		__u64 	icsr_rsvd: 	22,	/* unused */
                    	icsr_max_burst:	10,	/* max burst */
                         icsr_rsvd4:	 6,	/* reserved */
                    	icsr_max_retry:	10,	/* max retry */
@@ -237,9 +237,9 @@
 
 
 typedef union hubii_iowa_u {
-	u64	iowa_reg_value;
+	__u64	iowa_reg_value;
 	struct {
-		u64 	iowa_rsvd: 	48,	/* unused */
+		__u64 	iowa_rsvd: 	48,	/* unused */
                        	iowa_wxoac:	 8,	/* xtalk widget access bits */
                    	iowa_rsvd1:	 7,	/* xtalk widget access bits */
                   	iowa_w0oac:	 1;	/* xtalk widget access bits */
@@ -247,9 +247,9 @@
 } hubii_iowa_t;
 
 typedef union hubii_iiwa_u {
-	u64	iiwa_reg_value;
+	__u64	iiwa_reg_value;
 	struct {
-		u64 	iiwa_rsvd: 	48,	/* unused */
+		__u64 	iiwa_rsvd: 	48,	/* unused */
 			iiwa_wxiac:	 8,	/* hub wid access bits */
 			iiwa_rsvd1:	 7,	/* reserved */
 			iiwa_w0iac:	 1;	/* hub wid0 access */
@@ -257,9 +257,9 @@
 } hubii_iiwa_t;
 
 typedef union	hubii_illr_u {
-	u64	illr_reg_value;
+	__u64	illr_reg_value;
 	struct {
-		u64 	illr_rsvd: 	32,	/* unused */
+		__u64 	illr_rsvd: 	32,	/* unused */
 			illr_cb_cnt:	16,	/* checkbit error count */
                    	illr_sn_cnt:	16;	/* sequence number count */
         } illr_fields_s;
@@ -271,9 +271,9 @@
 /* io_perf_sel allows the caller to specify what tests will be
    performed */
 typedef union io_perf_sel {
-	u64 perf_sel_reg;
+	__u64 perf_sel_reg;
 	struct {
-		u64 	perf_rsvd  : 48,
+		__u64 	perf_rsvd  : 48,
 		        perf_icct  :  8,
 		        perf_ippr1 :  4,
   		        perf_ippr0 :  4;
@@ -284,9 +284,9 @@
    hardware problems there is only one counter, not two. */
 
 typedef union io_perf_cnt {
-	u64	perf_cnt;
+	__u64	perf_cnt;
 	struct {
-		u64	perf_rsvd1 : 32,
+		__u64	perf_rsvd1 : 32,
   			        perf_rsvd2 : 12,
   			        perf_cnt   : 20;
 	} perf_cnt_bits;
@@ -442,9 +442,9 @@
  */
 #ifndef __ASSEMBLY__
 typedef union icrba_u {
-	u64	reg_value;
+	__u64	reg_value;
 	struct {
-		u64 	resvd: 	6,
+		__u64 	resvd: 	6,
 			stall_bte0: 1,	/* Stall BTE 0 */
 			stall_bte1: 1,	/* Stall BTE 1 */
 			error:	1,	/* CRB has an error	*/
@@ -464,10 +464,10 @@
    runtime selection of the format based on the REV_ID field of the
    NI_STATUS_REV_ID register. */
 typedef union h1_icrba_u {
-	u64	reg_value;
+	__u64	reg_value;
 
 	struct {
-		u64 	resvd: 	6,
+		__u64 	resvd: 	6,
 			unused:	1,	/* Unused but RW!!	*/
 			error:	1,	/* CRB has an error	*/
 			ecode:	4,	/* Error Code 		*/
@@ -525,9 +525,9 @@
  */
 #ifndef __ASSEMBLY__
 typedef union icrbb_u {
-	u64	reg_value;
+	__u64	reg_value;
 	struct {
-	    u64	rsvd1:	5,
+	    __u64	rsvd1:	5,
 		btenum:	1,	/* BTE to which entry belongs to */
 		cohtrans: 1,	/* Coherent transaction	*/
 		xtsize:	2,	/* Xtalk operation size
@@ -567,9 +567,9 @@
    runtime selection of the format based on the REV_ID field of the
    NI_STATUS_REV_ID register. */
 typedef union h1_icrbb_u {
-	u64	reg_value;
+	__u64	reg_value;
 	struct {
-		u64	rsvd1:	5,
+		__u64	rsvd1:	5,
 			btenum:	1,	/* BTE to which entry belongs to */
 			cohtrans: 1,	/* Coherent transaction	*/
 			xtsize:	2,	/* Xtalk operation size
@@ -683,9 +683,9 @@
 #ifndef __ASSEMBLY__
 
 typedef union icrbc_s {
-	u64	reg_value;
+	__u64	reg_value;
 	struct {
-		u64	rsvd:	6,
+		__u64	rsvd:	6,
 			sleep:	1,
 			pricnt: 4,	/* Priority count sent with Read req */
 			pripsc: 4,	/* Priority Pre scalar 	*/
@@ -720,9 +720,9 @@
 
 #ifndef __ASSEMBLY__
 typedef union icrbd_s {
-	u64	reg_value;
+	__u64	reg_value;
 	struct {
-	    u64	rsvd:	38,
+	    __u64	rsvd:	38,
 		toutvld: 1,	/* Timeout in progress for this CRB */
 		ctxtvld: 1,	/* Context field below is valid	*/
 		rsvd2:	1,
@@ -742,9 +742,9 @@
 
 
 typedef union hubii_ifdr_u {
-	u64	hi_ifdr_value;
+	__u64	hi_ifdr_value;
 	struct {
-		u64	ifdr_rsvd:	49,
+		__u64	ifdr_rsvd:	49,
 	                ifdr_maxrp:	 7,
 	                ifdr_rsvd1:	 1,
                       	ifdr_maxrq:	 7;
@@ -801,9 +801,9 @@
 #ifndef __ASSEMBLY__
 
 typedef union iprte_a {
-	u64	entry;
+	__u64	entry;
 	struct {
-	    u64	rsvd1     : 7,  /* Reserved field 		*/
+	    __u64	rsvd1     : 7,  /* Reserved field 		*/
 		valid     : 1,	/* Maps to a timeout entry	*/
 		rsvd2     : 1,
 		srcnode   : 9,	/* Node which did this PIO	*/
@@ -835,9 +835,9 @@
  */
 
 typedef union iprb_u {
-	u64	reg_value;
+	__u64	reg_value;
 	struct {
-	    u64	rsvd1:	15,
+	    __u64	rsvd1:	15,
 		error:	1,	/* Widget rcvd wr resp pkt w/ error */
 		ovflow:	5,	/* Over flow count. perf measurement */
 		fire_and_forget: 1, /* Launch Write without response */
@@ -877,9 +877,9 @@
  */
 #ifndef __ASSEMBLY__
 typedef union icrbp_a {
-	u64   ip_reg;	    /* the entire register value	*/
+	__u64   ip_reg;	    /* the entire register value	*/
 	struct {
-	     u64 error:	1,  /*    63, error occurred		*/
+	     __u64 error:	1,  /*    63, error occurred		*/
 		ln_uce:	1,  /*    62: uncorrectable memory 	*/
 		ln_ae:	1,  /*    61: protection violation 	*/
 		ln_werr:1,  /*    60: write access error 	*/
@@ -919,9 +919,9 @@
 
 #ifndef __ASSEMBLY__
 typedef union hubii_idsr {
-	u64 iin_reg;
+	__u64 iin_reg;
 	struct {
-		u64 rsvd1 : 35,
+		__u64 rsvd1 : 35,
 	            isent : 1,
 	            rsvd2 : 3,
 	            ienable: 1,
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/sn0/hubmd.h linux-libc-headers-2.6.8.0/include/asm-mips/sn/sn0/hubmd.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/sn0/hubmd.h	2004-01-17 17:03:49.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/sn/sn0/hubmd.h	2004-08-26 05:27:00.000000000 -0500
@@ -541,7 +541,7 @@
  */
 
 struct dir_error_reg {
-	u64	uce_vld:   1,	/*    63: valid directory uce 	*/
+	__u64	uce_vld:   1,	/*    63: valid directory uce 	*/
 		ae_vld:	   1,	/*    62: valid dir prot ecc error */
 		ce_vld:	   1,	/*    61: valid correctable ECC err*/
 		rsvd1:	  19,	/* 60-42: reserved		*/
@@ -555,13 +555,13 @@
 };
 
 typedef union md_dir_error {
-	u64	derr_reg;	/* the entire register 		*/
+	__u64	derr_reg;	/* the entire register 		*/
 	struct dir_error_reg derr_fmt;	/* the register format		*/
 } md_dir_error_t;
 
 
 struct mem_error_reg {
-	u64	uce_vld:   1,	/*    63: valid memory uce 	*/
+	__u64	uce_vld:   1,	/*    63: valid memory uce 	*/
 		ce_vld:	   1,	/*    62: valid correctable ECC err*/
 		rsvd1:	  22,	/* 61-40: reserved		*/
 		bad_syn:   8,	/* 39-32: bad mem ecc syndrome	*/
@@ -573,13 +573,13 @@
 
 
 typedef union md_mem_error {
-	u64	merr_reg;	/* the entire register 		*/
+	__u64	merr_reg;	/* the entire register 		*/
 	struct mem_error_reg  merr_fmt; /* format of the mem_error reg  */
 } md_mem_error_t;
 
 
 struct proto_error_reg {
-	u64	valid:	   1,	/*    63: valid protocol error	*/
+	__u64	valid:	   1,	/*    63: valid protocol error	*/
 		rsvd1:	   2,	/* 62-61: reserved		*/
 		initiator:11,	/* 60-50: id of request initiator*/
 		backoff:   2,	/* 49-48: backoff control	*/
@@ -594,7 +594,7 @@
 };
 
 typedef union md_proto_error {
-	u64	perr_reg;	/* the entire register 		*/
+	__u64	perr_reg;	/* the entire register 		*/
 	struct proto_error_reg	perr_fmt; /* format of the register	*/
 } md_proto_error_t;
 
@@ -642,7 +642,7 @@
 
 
 struct md_pdir_high_fmt {
-	u64	pd_hi_unused   : 16,
+	__u64	pd_hi_unused   : 16,
 		pd_hi_bvec     : 38,
 		pd_hi_unused1  : 3,
 		pd_hi_ecc      : 7;
@@ -651,14 +651,14 @@
 
 typedef union md_pdir_high {
 	/* The 48 bits of standard directory, upper word */
-	u64	pd_hi_val;
+	__u64	pd_hi_val;
 	struct md_pdir_high_fmt pd_hi_fmt;
 }md_pdir_high_t;
 
 
 struct md_pdir_low_shared_fmt {
 	/* The meaning of lower directory, shared */
-	u64	pds_lo_unused	: 16,
+	__u64	pds_lo_unused	: 16,
 		pds_lo_bvec	: 26,
 		pds_lo_cnt	:  6,
 		pds_lo_state	:  3,
@@ -670,7 +670,7 @@
 
 struct md_pdir_low_exclusive_fmt {
 	/* The meaning of lower directory, exclusive */
-	u64	pde_lo_unused	: 31,
+	__u64	pde_lo_unused	: 31,
 		pde_lo_ptr	: 11,
 		pde_lo_unused1	:  6,
 		pde_lo_state	:  3,
@@ -683,7 +683,7 @@
 
 typedef union md_pdir_loent {
 	/* The 48 bits of premium directory, lower word */
-	u64	pd_lo_val;
+	__u64	pd_lo_val;
 	struct md_pdir_low_exclusive_fmt pde_lo_fmt;
 	struct md_pdir_low_shared_fmt	pds_lo_fmt;
 }md_pdir_low_t;
@@ -711,25 +711,25 @@
 } bddir_entry_t;
 
 typedef struct	dir_mem_entry	{
-        u64		prcpf[MAX_REGIONS];
+        __u64		prcpf[MAX_REGIONS];
         bddir_entry_t	directory_words[MD_PAGE_SIZE/CACHE_SLINE_SIZE];
 } dir_mem_entry_t;
 
 
 
 typedef union md_perf_sel {
-	u64 	perf_sel_reg;
+	__u64 	perf_sel_reg;
 	struct	{
-		u64	perf_rsvd : 60,
+		__u64	perf_rsvd : 60,
 		        perf_en   :  1,
 			perf_sel  :  3;
 	} perf_sel_bits;
 } md_perf_sel_t;
 
 typedef union md_perf_cnt {
-	u64	perf_cnt;
+	__u64	perf_cnt;
 	struct	{
-		u64	perf_rsvd : 44,
+		__u64	perf_rsvd : 44,
 	                perf_cnt  : 20;
 	} perf_cnt_bits;
 } md_perf_cnt_t;
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/sn0/hubni.h linux-libc-headers-2.6.8.0/include/asm-mips/sn/sn0/hubni.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/sn0/hubni.h	2003-12-15 12:47:02.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/sn/sn0/hubni.h	2004-08-26 05:26:48.000000000 -0500
@@ -229,9 +229,9 @@
 #ifndef __ASSEMBLY__
 
 typedef union	hubni_port_error_u {
-	u64	nipe_reg_value;
+	__u64	nipe_reg_value;
 	struct {
-	    u64	nipe_rsvd:	26,	/* unused */
+	    __u64    nipe_rsvd:	26,	/* unused */
 		nipe_lnk_reset:	 1,	/* link reset */
 		nipe_intl_err:	 1,	/* internal error */
 		nipe_bad_msg:	 1,	/* bad message */
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/sn0/hubpi.h linux-libc-headers-2.6.8.0/include/asm-mips/sn/sn0/hubpi.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/sn/sn0/hubpi.h	2003-12-15 12:47:02.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/sn/sn0/hubpi.h	2004-08-26 05:26:36.000000000 -0500
@@ -312,7 +312,7 @@
  */
 
 struct err_stack_format {
-	u64	sk_addr	   : 33,   /* address */
+	__u64	sk_addr	   : 33,   /* address */
 		sk_cmd	   :  8,   /* message command */
 		sk_crb_sts : 10,   /* status from RRB or WRB */
 		sk_rw_rb   :  1,   /* RRB == 0, WRB == 1 */
@@ -323,12 +323,12 @@
 };
 
 typedef union pi_err_stack {
-	u64	pi_stk_word;
+	__u64	pi_stk_word;
 	struct	err_stack_format pi_stk_fmt;
 } pi_err_stack_t;
 
 struct err_status0_format {
-	u64	s0_valid   :  1,   /* Valid */
+	__u64	s0_valid   :  1,   /* Valid */
 		s0_ovr_run :  1,   /* Overrun, spooled to memory */
 		s0_addr	   : 37,   /* address */
 		s0_cmd	   :  8,   /* message command */
@@ -338,12 +338,12 @@
 };
 
 typedef union pi_err_stat0 {
-	u64	pi_stat0_word;
+	__u64	pi_stat0_word;
 	struct err_status0_format pi_stat0_fmt;
 } pi_err_stat0_t;
 
 struct err_status1_format {
-	u64	s1_src	   : 11,   /* message source */
+	__u64	s1_src	   : 11,   /* message source */
 		s1_crb_sts : 10,   /* status from RRB or WRB */
 		s1_rw_rb   :  1,   /* RRB == 0, WRB == 1 */
 		s1_crb_num :  3,   /* WRB (0 to 7) or RRB (0 to 4) */
@@ -353,11 +353,11 @@
 };
 
 typedef union pi_err_stat1 {
-	u64	pi_stat1_word;
+	__u64	pi_stat1_word;
 	struct err_status1_format pi_stat1_fmt;
 } pi_err_stat1_t;
 
-typedef u64	rtc_time_t;
+typedef __u64	rtc_time_t;
 
 #endif /* !__ASSEMBLY__ */
 
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/stackframe.h linux-libc-headers-2.6.8.0/include/asm-mips/stackframe.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/stackframe.h	2004-08-18 13:15:41.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/asm-mips/stackframe.h	2004-08-26 05:14:41.000000000 -0500
@@ -25,7 +25,7 @@
 
 		.macro	SAVE_TEMP
 		mfhi	v1
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
 		LONG_S	$8, PT_R8(sp)
 		LONG_S	$9, PT_R9(sp)
 #endif
@@ -55,7 +55,7 @@
 
 #ifdef CONFIG_SMP
 		.macro	get_saved_sp	/* SMP variation */
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
 		mfc0	k0, CP0_CONTEXT
 		lui	k1, %hi(kernelsp)
 		srl	k0, k0, 23
@@ -63,7 +63,7 @@
 		addu	k1, k0
 		LONG_L	k1, %lo(kernelsp)(k1)
 #endif
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
 		MFC0	k1, CP0_CONTEXT
 		dsra	k1, 23
 		lui	k0, %hi(pgd_current)
@@ -76,13 +76,13 @@
 		.endm
 
 		.macro	set_saved_sp stackp temp temp2
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
 		mfc0	\temp, CP0_CONTEXT
 		srl	\temp, 23
 		sll	\temp, 2
 		LONG_S	\stackp, kernelsp(\temp)
 #endif
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
 		lw	\temp, TI_CPU(gp)
 		dsll	\temp, 3
 		lui	\temp2, %hi(kernelsp)
@@ -127,7 +127,7 @@
 		LONG_S	$6, PT_R6(sp)
 		MFC0	v1, CP0_EPC
 		LONG_S	$7, PT_R7(sp)
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
 		LONG_S	$8, PT_R8(sp)
 		LONG_S	$9, PT_R9(sp)
 #endif
@@ -156,7 +156,7 @@
 
 		.macro	RESTORE_TEMP
 		LONG_L	$24, PT_LO(sp)
-#ifdef CONFIG_MIPS32
+#ifndef __mips64
 		LONG_L	$8, PT_R8(sp)
 		LONG_L	$9, PT_R9(sp)
 #endif
@@ -204,7 +204,7 @@
 		LONG_L	$31, PT_R31(sp)
 		LONG_L	$28, PT_R28(sp)
 		LONG_L	$25, PT_R25(sp)
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
 		LONG_L	$8, PT_R8(sp)
 		LONG_L	$9, PT_R9(sp)
 #endif
@@ -249,7 +249,7 @@
 		LONG_L	$31, PT_R31(sp)
 		LONG_L	$28, PT_R28(sp)
 		LONG_L	$25, PT_R25(sp)
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
 		LONG_L	$8, PT_R8(sp)
 		LONG_L	$9, PT_R9(sp)
 #endif
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/system.h linux-libc-headers-2.6.8.0/include/asm-mips/system.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/system.h	2004-08-18 13:15:42.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/asm-mips/system.h	2004-08-28 18:13:39.000000000 -0500
@@ -15,10 +15,11 @@
 #include <asm/sgidefs.h>
 
 #include <linux/kernel.h>
+#include <linux/linkage.h>
 
 #include <asm/addrspace.h>
 #include <asm/ptrace.h>
-#include <asm/hazards.h>
+#include <asm/types.h>
 
 __asm__ (
 	".macro\tlocal_irq_enable\n\t"
@@ -311,7 +312,7 @@
 	return retval;
 }
 
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
 static inline __u64 __xchg_u64(volatile __u64 * m, __u64 val)
 {
 	__u64 retval;
@@ -406,7 +407,7 @@
 	return retval;
 }
 
-#ifdef CONFIG_MIPS64
+#ifdef __mips64
 static inline unsigned long __cmpxchg_u64(volatile int * m, unsigned long old,
 	unsigned long new)
 {
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/tx4927/tx4927_mips.h linux-libc-headers-2.6.8.0/include/asm-mips/tx4927/tx4927_mips.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/tx4927/tx4927_mips.h	2003-12-15 12:47:03.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/tx4927/tx4927_mips.h	2004-08-26 05:22:30.000000000 -0500
@@ -36,15 +36,15 @@
 		".set\tmips0");
 }
 
-#define reg_rd08(r)    ((u8 )(*((vu8 *)(r))))
-#define reg_rd16(r)    ((u16)(*((vu16*)(r))))
-#define reg_rd32(r)    ((u32)(*((vu32*)(r))))
-#define reg_rd64(r)    ((u64)(*((vu64*)(r))))
+#define reg_rd08(r)    ((__u8 )(*((vu8 *)(r))))
+#define reg_rd16(r)    ((__u16)(*((vu16*)(r))))
+#define reg_rd32(r)    ((__u32)(*((vu32*)(r))))
+#define reg_rd64(r)    ((__u64)(*((vu64*)(r))))
 
-#define reg_wr08(r,v)  ((*((vu8 *)(r)))=((u8 )(v)))
-#define reg_wr16(r,v)  ((*((vu16*)(r)))=((u16)(v)))
-#define reg_wr32(r,v)  ((*((vu32*)(r)))=((u32)(v)))
-#define reg_wr64(r,v)  ((*((vu64*)(r)))=((u64)(v)))
+#define reg_wr08(r,v)  ((*((vu8 *)(r)))=((__u8 )(v)))
+#define reg_wr16(r,v)  ((*((vu16*)(r)))=((__u16)(v)))
+#define reg_wr32(r,v)  ((*((vu32*)(r)))=((__u32)(v)))
+#define reg_wr64(r,v)  ((*((vu64*)(r)))=((__u64)(v)))
 
 typedef volatile __signed char vs8;
 typedef volatile unsigned char vu8;
@@ -55,10 +55,10 @@
 typedef volatile __signed int vs32;
 typedef volatile unsigned int vu32;
 
-typedef  s8  s08;
+typedef  __s8  s08;
 typedef vs8 vs08;
 
-typedef  u8  u08;
+typedef  __u8  u08;
 typedef vu8 vu08;
 
 
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/unaligned.h linux-libc-headers-2.6.8.0/include/asm-mips/unaligned.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/unaligned.h	2004-08-15 15:38:27.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/asm-mips/unaligned.h	2004-08-26 05:22:21.000000000 -0500
@@ -17,7 +17,7 @@
  *
  * This macro should be used for accessing values larger in size than
  * single bytes at locations that are expected to be improperly aligned,
- * e.g. retrieving a u16 value from a location not u16-aligned.
+ * e.g. retrieving a __u16 value from a location not __u16-aligned.
  *
  * Note that unaligned accesses can be very expensive on some architectures.
  */
@@ -31,7 +31,7 @@
  *
  * This macro should be used for placing values larger in size than
  * single bytes at locations that are expected to be improperly aligned,
- * e.g. writing a u16 value to a location not u16-aligned.
+ * e.g. writing a __u16 value to a location not __u16-aligned.
  *
  * Note that unaligned accesses can be very expensive on some architectures.
  */
diff -urN linux-libc-headers-2.6.8.0-dist/include/asm-mips/xtalk/xwidget.h linux-libc-headers-2.6.8.0/include/asm-mips/xtalk/xwidget.h
--- linux-libc-headers-2.6.8.0-dist/include/asm-mips/xtalk/xwidget.h	2003-12-15 12:47:03.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/asm-mips/xtalk/xwidget.h	2004-08-26 05:23:33.000000000 -0500
@@ -92,7 +92,7 @@
  * defined here
  */
 #ifndef __ASSEMBLY__
-typedef u32 widgetreg_t;
+typedef __u32 widgetreg_t;
 
 /* widget configuration registers */
 typedef volatile struct widget_cfg {
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/acpi.h linux-libc-headers-2.6.8.0/include/linux/acpi.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/acpi.h	2004-08-18 13:16:01.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/acpi.h	2004-08-26 05:41:49.000000000 -0500
@@ -51,49 +51,49 @@
 
 struct acpi_table_rsdp {
 	char			signature[8];
-	u8			checksum;
+	__u8			checksum;
 	char			oem_id[6];
-	u8			revision;
-	u32			rsdt_address;
+	__u8			revision;
+	__u32			rsdt_address;
 } __attribute__ ((packed));
 
 struct acpi20_table_rsdp {
 	char			signature[8];
-	u8			checksum;
+	__u8			checksum;
 	char			oem_id[6];
-	u8			revision;
-	u32			rsdt_address;
-	u32			length;
-	u64			xsdt_address;
-	u8			ext_checksum;
-	u8			reserved[3];
+	__u8			revision;
+	__u32			rsdt_address;
+	__u32			length;
+	__u64			xsdt_address;
+	__u8			ext_checksum;
+	__u8			reserved[3];
 } __attribute__ ((packed));
 
 typedef struct {
-	u8			type;
-	u8			length;
+	__u8			type;
+	__u8			length;
 } __attribute__ ((packed)) acpi_table_entry_header;
 
 /* Root System Description Table (RSDT) */
 
 struct acpi_table_rsdt {
 	struct acpi_table_header header;
-	u32			entry[8];
+	__u32			entry[8];
 } __attribute__ ((packed));
 
 /* Extended System Description Table (XSDT) */
 
 struct acpi_table_xsdt {
 	struct acpi_table_header header;
-	u64			entry[1];
+	__u64			entry[1];
 } __attribute__ ((packed));
 
 /* Fixed ACPI Description Table (FADT) */
 
 struct acpi_table_fadt {
 	struct acpi_table_header header;
-	u32 facs_addr;
-	u32 dsdt_addr;
+	__u32 facs_addr;
+	__u32 dsdt_addr;
 	/* ... */
 } __attribute__ ((packed));
 
@@ -101,10 +101,10 @@
 
 struct acpi_table_madt {
 	struct acpi_table_header header;
-	u32			lapic_address;
+	__u32			lapic_address;
 	struct {
-		u32			pcat_compat:1;
-		u32			reserved:31;
+		__u32			pcat_compat:1;
+		__u32			reserved:31;
 	}			flags;
 } __attribute__ ((packed));
 
@@ -122,85 +122,85 @@
 };
 
 typedef struct {
-	u16			polarity:2;
-	u16			trigger:2;
-	u16			reserved:12;
+	__u16			polarity:2;
+	__u16			trigger:2;
+	__u16			reserved:12;
 } __attribute__ ((packed)) acpi_interrupt_flags;
 
 struct acpi_table_lapic {
 	acpi_table_entry_header	header;
-	u8			acpi_id;
-	u8			id;
+	__u8			acpi_id;
+	__u8			id;
 	struct {
-		u32			enabled:1;
-		u32			reserved:31;
+		__u32			enabled:1;
+		__u32			reserved:31;
 	}			flags;
 } __attribute__ ((packed));
 
 struct acpi_table_ioapic {
 	acpi_table_entry_header	header;
-	u8			id;
-	u8			reserved;
-	u32			address;
-	u32			global_irq_base;
+	__u8			id;
+	__u8			reserved;
+	__u32			address;
+	__u32			global_irq_base;
 } __attribute__ ((packed));
 
 struct acpi_table_int_src_ovr {
 	acpi_table_entry_header	header;
-	u8			bus;
-	u8			bus_irq;
-	u32			global_irq;
+	__u8			bus;
+	__u8			bus_irq;
+	__u32			global_irq;
 	acpi_interrupt_flags	flags;
 } __attribute__ ((packed));
 
 struct acpi_table_nmi_src {
 	acpi_table_entry_header	header;
 	acpi_interrupt_flags	flags;
-	u32			global_irq;
+	__u32			global_irq;
 } __attribute__ ((packed));
 
 struct acpi_table_lapic_nmi {
 	acpi_table_entry_header	header;
-	u8			acpi_id;
+	__u8			acpi_id;
 	acpi_interrupt_flags	flags;
-	u8			lint;
+	__u8			lint;
 } __attribute__ ((packed));
 
 struct acpi_table_lapic_addr_ovr {
 	acpi_table_entry_header	header;
-	u8			reserved[2];
-	u64			address;
+	__u8			reserved[2];
+	__u64			address;
 } __attribute__ ((packed));
 
 struct acpi_table_iosapic {
 	acpi_table_entry_header	header;
-	u8			id;
-	u8			reserved;
-	u32			global_irq_base;
-	u64			address;
+	__u8			id;
+	__u8			reserved;
+	__u32			global_irq_base;
+	__u64			address;
 } __attribute__ ((packed));
 
 struct acpi_table_lsapic {
 	acpi_table_entry_header	header;
-	u8			acpi_id;
-	u8			id;
-	u8			eid;
-	u8			reserved[3];
+	__u8			acpi_id;
+	__u8			id;
+	__u8			eid;
+	__u8			reserved[3];
 	struct {
-		u32			enabled:1;
-		u32			reserved:31;
+		__u32			enabled:1;
+		__u32			reserved:31;
 	}			flags;
 } __attribute__ ((packed));
 
 struct acpi_table_plat_int_src {
 	acpi_table_entry_header	header;
 	acpi_interrupt_flags	flags;
-	u8			type;	/* See acpi_interrupt_type */
-	u8			id;
-	u8			eid;
-	u8			iosapic_vector;
-	u32			global_irq;
-	u32			reserved;
+	__u8			type;	/* See acpi_interrupt_type */
+	__u8			id;
+	__u8			eid;
+	__u8			iosapic_vector;
+	__u32			global_irq;
+	__u32			reserved;
 } __attribute__ ((packed));
 
 enum acpi_interrupt_id {
@@ -213,21 +213,21 @@
 #define	ACPI_SPACE_MEM		0
 
 struct acpi_gen_regaddr {
-	u8  space_id;
-	u8  bit_width;
-	u8  bit_offset;
-	u8  resv;
-	u32 addrl;
-	u32 addrh;
+	__u8  space_id;
+	__u8  bit_width;
+	__u8  bit_offset;
+	__u8  resv;
+	__u32 addrl;
+	__u32 addrh;
 } __attribute__ ((packed));
 
 struct acpi_table_hpet {
 	struct acpi_table_header header;
-	u32 id;
+	__u32 id;
 	struct acpi_gen_regaddr addr;
-	u8 number;
-	u16 min_tick;
-	u8 page_protect;
+	__u8 number;
+	__u16 min_tick;
+	__u8 page_protect;
 } __attribute__ ((packed));
 
 /*
@@ -236,17 +236,17 @@
  */
 struct acpi_table_sbf
 {
-	u8 sbf_signature[4];
-	u32 sbf_len;
-	u8 sbf_revision;
-	u8 sbf_csum;
-	u8 sbf_oemid[6];
-	u8 sbf_oemtable[8];
-	u8 sbf_revdata[4];
-	u8 sbf_creator[4];
-	u8 sbf_crearev[4];
-	u8 sbf_cmos;
-	u8 sbf_spare[3];
+	__u8 sbf_signature[4];
+	__u32 sbf_len;
+	__u8 sbf_revision;
+	__u8 sbf_csum;
+	__u8 sbf_oemid[6];
+	__u8 sbf_oemtable[8];
+	__u8 sbf_revdata[4];
+	__u8 sbf_creator[4];
+	__u8 sbf_crearev[4];
+	__u8 sbf_cmos;
+	__u8 sbf_spare[3];
 } __attribute__ ((packed));
 
 /*
@@ -256,8 +256,8 @@
 
 struct acpi_table_srat {
 	struct acpi_table_header header;
-	u32			table_revision;
-	u64			reserved;
+	__u32			table_revision;
+	__u64			reserved;
 } __attribute__ ((packed));
 
 enum acpi_srat_entry_id {
@@ -268,31 +268,31 @@
 
 struct acpi_table_processor_affinity {
 	acpi_table_entry_header	header;
-	u8			proximity_domain;
-	u8			apic_id;
+	__u8			proximity_domain;
+	__u8			apic_id;
 	struct {
-		u32			enabled:1;
-		u32			reserved:31;
+		__u32			enabled:1;
+		__u32			reserved:31;
 	}			flags;
-	u8			lsapic_eid;
-	u8			reserved[7];
+	__u8			lsapic_eid;
+	__u8			reserved[7];
 } __attribute__ ((packed));
 
 struct acpi_table_memory_affinity {
 	acpi_table_entry_header	header;
-	u8			proximity_domain;
-	u8			reserved1[5];
-	u32			base_addr_lo;
-	u32			base_addr_hi;
-	u32			length_lo;
-	u32			length_hi;
-	u32			memory_type;	/* See acpi_address_range_id */
+	__u8			proximity_domain;
+	__u8			reserved1[5];
+	__u32			base_addr_lo;
+	__u32			base_addr_hi;
+	__u32			length_lo;
+	__u32			length_hi;
+	__u32			memory_type;	/* See acpi_address_range_id */
 	struct {
-		u32			enabled:1;
-		u32			hot_pluggable:1;
-		u32			reserved:30;
+		__u32			enabled:1;
+		__u32			hot_pluggable:1;
+		__u32			reserved:30;
 	}			flags;
-	u64			reserved2;
+	__u64			reserved2;
 } __attribute__ ((packed));
 
 enum acpi_address_range_id {
@@ -310,17 +310,17 @@
 
 struct acpi_table_slit {
 	struct acpi_table_header header;
-	u64			localities;
-	u8			entry[1];	/* real size = localities^2 */
+	__u64			localities;
+	__u8			entry[1];	/* real size = localities^2 */
 } __attribute__ ((packed));
 
 /* Smart Battery Description Table (SBST) */
 
 struct acpi_table_sbst {
 	struct acpi_table_header header;
-	u32			warning;	/* Warn user */
-	u32			low;		/* Critical sleep */
-	u32			critical;	/* Critical shutdown */
+	__u32			warning;	/* Warn user */
+	__u32			low;		/* Critical sleep */
+	__u32			critical;	/* Critical shutdown */
 } __attribute__ ((packed));
 
 /* Embedded Controller Boot Resources Table (ECDT) */
@@ -329,8 +329,8 @@
 	struct acpi_table_header 	header;
 	struct acpi_generic_address	ec_control;
 	struct acpi_generic_address	ec_data;
-	u32				uid;
-	u8				gpe_bit;
+	__u32				uid;
+	__u8				gpe_bit;
 	char				ec_id[0];
 } __attribute__ ((packed));
 
@@ -338,9 +338,9 @@
 
 struct acpi_table_mcfg {
 	struct acpi_table_header	header;
-	u8				reserved[8];
-	u32				base_address;
-	u32				base_reserved;
+	__u8				reserved[8];
+	__u32				base_address;
+	__u32				base_reserved;
 } __attribute__ ((packed));
 
 /* Table Handlers */
@@ -396,7 +396,7 @@
 
 extern int acpi_mp_config;
 
-extern u32 pci_mmcfg_base_addr;
+extern __u32 pci_mmcfg_base_addr;
 
 extern int sbf_port ;
 
@@ -411,20 +411,20 @@
 
 #endif 	/*!CONFIG_ACPI_BOOT*/
 
-unsigned int acpi_register_gsi (u32 gsi, int edge_level, int active_high_low);
-int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);
+unsigned int acpi_register_gsi (__u32 gsi, int edge_level, int active_high_low);
+int acpi_gsi_to_irq (__u32 gsi, unsigned int *irq);
 
 #ifdef CONFIG_ACPI_PCI
 
 struct acpi_prt_entry {
 	struct list_head	node;
 	struct acpi_pci_id	id;
-	u8			pin;
+	__u8			pin;
 	struct {
 		acpi_handle		handle;
-		u32			index;
+		__u32			index;
 	}			link;
-	u32			irq;
+	__u32			irq;
 };
 
 struct acpi_prt_list {
@@ -451,8 +451,8 @@
 
 #ifdef CONFIG_ACPI_EC
 
-int ec_read(u8 addr, u8 *val);
-int ec_write(u8 addr, u8 val);
+int ec_read(__u8 addr, __u8 *val);
+int ec_write(__u8 addr, __u8 val);
 
 #endif /*CONFIG_ACPI_EC*/
 
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/affs_fs_i.h linux-libc-headers-2.6.8.0/include/linux/affs_fs_i.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/affs_fs_i.h	2003-12-31 17:46:48.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/affs_fs_i.h	2004-08-26 05:41:49.000000000 -0500
@@ -9,13 +9,13 @@
 //#define AFFS_CACHE_SIZE		(4*4)
 
 #define AFFS_MAX_PREALLOC	32
-#define AFFS_LC_SIZE		(AFFS_CACHE_SIZE/sizeof(u32)/2)
+#define AFFS_LC_SIZE		(AFFS_CACHE_SIZE/sizeof(__u32)/2)
 #define AFFS_AC_SIZE		(AFFS_CACHE_SIZE/sizeof(struct affs_ext_key)/2)
 #define AFFS_AC_MASK		(AFFS_AC_SIZE-1)
 
 struct affs_ext_key {
-	u32	ext;				/* idx of the extended block */
-	u32	key;				/* block number */
+	__u32	ext;				/* idx of the extended block */
+	__u32	key;				/* block number */
 };
 
 
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/affs_fs_sb.h linux-libc-headers-2.6.8.0/include/linux/affs_fs_sb.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/affs_fs_sb.h	2004-08-18 13:16:01.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/affs_fs_sb.h	2004-08-26 05:41:49.000000000 -0500
@@ -9,8 +9,8 @@
  */
 
 struct affs_bm_info {
-	u32 bm_key;			/* Disk block number */
-	u32 bm_free;			/* Free blocks in here */
+	__u32 bm_key;			/* Disk block number */
+	__u32 bm_free;			/* Free blocks in here */
 };
 
 #define SF_INTL		0x0001		/* International filesystem. */
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/affs_hardblocks.h linux-libc-headers-2.6.8.0/include/linux/affs_hardblocks.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/affs_hardblocks.h	2003-12-15 12:46:58.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/affs_hardblocks.h	2004-08-26 05:41:49.000000000 -0500
@@ -4,59 +4,59 @@
 /* Just the needed definitions for the RDB of an Amiga HD. */
 
 struct RigidDiskBlock {
-	u32	rdb_ID;
-	u32	rdb_SummedLongs;
-	s32	rdb_ChkSum;
-	u32	rdb_HostID;
-	u32	rdb_BlockBytes;
-	u32	rdb_Flags;
-	u32	rdb_BadBlockList;
-	u32	rdb_PartitionList;
-	u32	rdb_FileSysHeaderList;
-	u32	rdb_DriveInit;
-	u32	rdb_Reserved1[6];
-	u32	rdb_Cylinders;
-	u32	rdb_Sectors;
-	u32	rdb_Heads;
-	u32	rdb_Interleave;
-	u32	rdb_Park;
-	u32	rdb_Reserved2[3];
-	u32	rdb_WritePreComp;
-	u32	rdb_ReducedWrite;
-	u32	rdb_StepRate;
-	u32	rdb_Reserved3[5];
-	u32	rdb_RDBBlocksLo;
-	u32	rdb_RDBBlocksHi;
-	u32	rdb_LoCylinder;
-	u32	rdb_HiCylinder;
-	u32	rdb_CylBlocks;
-	u32	rdb_AutoParkSeconds;
-	u32	rdb_HighRDSKBlock;
-	u32	rdb_Reserved4;
+	__u32	rdb_ID;
+	__u32	rdb_SummedLongs;
+	__s32	rdb_ChkSum;
+	__u32	rdb_HostID;
+	__u32	rdb_BlockBytes;
+	__u32	rdb_Flags;
+	__u32	rdb_BadBlockList;
+	__u32	rdb_PartitionList;
+	__u32	rdb_FileSysHeaderList;
+	__u32	rdb_DriveInit;
+	__u32	rdb_Reserved1[6];
+	__u32	rdb_Cylinders;
+	__u32	rdb_Sectors;
+	__u32	rdb_Heads;
+	__u32	rdb_Interleave;
+	__u32	rdb_Park;
+	__u32	rdb_Reserved2[3];
+	__u32	rdb_WritePreComp;
+	__u32	rdb_ReducedWrite;
+	__u32	rdb_StepRate;
+	__u32	rdb_Reserved3[5];
+	__u32	rdb_RDBBlocksLo;
+	__u32	rdb_RDBBlocksHi;
+	__u32	rdb_LoCylinder;
+	__u32	rdb_HiCylinder;
+	__u32	rdb_CylBlocks;
+	__u32	rdb_AutoParkSeconds;
+	__u32	rdb_HighRDSKBlock;
+	__u32	rdb_Reserved4;
 	char	rdb_DiskVendor[8];
 	char	rdb_DiskProduct[16];
 	char	rdb_DiskRevision[4];
 	char	rdb_ControllerVendor[8];
 	char	rdb_ControllerProduct[16];
 	char	rdb_ControllerRevision[4];
-	u32	rdb_Reserved5[10];
+	__u32	rdb_Reserved5[10];
 };
 
 #define	IDNAME_RIGIDDISK	0x5244534B	/* "RDSK" */
 
 struct PartitionBlock {
-	u32	pb_ID;
-	u32	pb_SummedLongs;
-	s32	pb_ChkSum;
-	u32	pb_HostID;
-	u32	pb_Next;
-	u32	pb_Flags;
-	u32	pb_Reserved1[2];
-	u32	pb_DevFlags;
-	u8	pb_DriveName[32];
-	u32	pb_Reserved2[15];
-	u32	pb_Environment[17];
-	u32	pb_EReserved[15];
+	__u32	pb_ID;
+	__u32	pb_SummedLongs;
+	__s32	pb_ChkSum;
+	__u32	pb_HostID;
+	__u32	pb_Next;
+	__u32	pb_Flags;
+	__u32	pb_Reserved1[2];
+	__u32	pb_DevFlags;
+	__u8	pb_DriveName[32];
+	__u32	pb_Reserved2[15];
+	__u32	pb_Environment[17];
+	__u32	pb_EReserved[15];
 };
 
 #define	IDNAME_PARTITION	0x50415254	/* "PART" */
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/amigaffs.h linux-libc-headers-2.6.8.0/include/linux/amigaffs.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/amigaffs.h	2003-12-31 17:46:48.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/amigaffs.h	2004-08-26 05:41:49.000000000 -0500
@@ -64,90 +64,90 @@
 #define AFFS_DATA(bh)		(((struct affs_data_head *)(bh)->b_data)->data)
 
 struct affs_date {
-	u32 days;
-	u32 mins;
-	u32 ticks;
+	__u32 days;
+	__u32 mins;
+	__u32 ticks;
 };
 
 struct affs_short_date {
-	u16 days;
-	u16 mins;
-	u16 ticks;
+	__u16 days;
+	__u16 mins;
+	__u16 ticks;
 };
 
 struct affs_root_head {
-	u32 ptype;
-	u32 spare1;
-	u32 spare2;
-	u32 hash_size;
-	u32 spare3;
-	u32 checksum;
-	u32 hashtable[1];
+	__u32 ptype;
+	__u32 spare1;
+	__u32 spare2;
+	__u32 hash_size;
+	__u32 spare3;
+	__u32 checksum;
+	__u32 hashtable[1];
 };
 
 struct affs_root_tail {
-	u32 bm_flag;
-	u32 bm_blk[AFFS_ROOT_BMAPS];
-	u32 bm_ext;
+	__u32 bm_flag;
+	__u32 bm_blk[AFFS_ROOT_BMAPS];
+	__u32 bm_ext;
 	struct affs_date root_change;
-	u8 disk_name[32];
-	u32 spare1;
-	u32 spare2;
+	__u8 disk_name[32];
+	__u32 spare1;
+	__u32 spare2;
 	struct affs_date disk_change;
 	struct affs_date disk_create;
-	u32 spare3;
-	u32 spare4;
-	u32 dcache;
-	u32 stype;
+	__u32 spare3;
+	__u32 spare4;
+	__u32 dcache;
+	__u32 stype;
 };
 
 struct affs_head {
-	u32 ptype;
-	u32 key;
-	u32 block_count;
-	u32 spare1;
-	u32 first_data;
-	u32 checksum;
-	u32 table[1];
+	__u32 ptype;
+	__u32 key;
+	__u32 block_count;
+	__u32 spare1;
+	__u32 first_data;
+	__u32 checksum;
+	__u32 table[1];
 };
 
 struct affs_tail {
-	u32 spare1;
-	u16 uid;
-	u16 gid;
-	u32 protect;
-	u32 size;
-	u8 comment[92];
+	__u32 spare1;
+	__u16 uid;
+	__u16 gid;
+	__u32 protect;
+	__u32 size;
+	__u8 comment[92];
 	struct affs_date change;
-	u8 name[32];
-	u32 spare2;
-	u32 original;
-	u32 link_chain;
-	u32 spare[5];
-	u32 hash_chain;
-	u32 parent;
-	u32 extension;
-	u32 stype;
+	__u8 name[32];
+	__u32 spare2;
+	__u32 original;
+	__u32 link_chain;
+	__u32 spare[5];
+	__u32 hash_chain;
+	__u32 parent;
+	__u32 extension;
+	__u32 stype;
 };
 
 struct slink_front
 {
-	u32 ptype;
-	u32 key;
-	u32 spare1[3];
-	u32 checksum;
-	u8 symname[1];	/* depends on block size */
+	__u32 ptype;
+	__u32 key;
+	__u32 spare1[3];
+	__u32 checksum;
+	__u8 symname[1];	/* depends on block size */
 };
 
 struct affs_data_head
 {
-	u32 ptype;
-	u32 key;
-	u32 sequence;
-	u32 size;
-	u32 next;
-	u32 checksum;
-	u8 data[1];	/* depends on block size */
+	__u32 ptype;
+	__u32 key;
+	__u32 sequence;
+	__u32 size;
+	__u32 next;
+	__u32 checksum;
+	__u8 data[1];	/* depends on block size */
 };
 
 /* Permission bits */
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/ata.h linux-libc-headers-2.6.8.0/include/linux/ata.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/ata.h	2004-08-18 13:16:01.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/ata.h	2004-08-26 05:41:49.000000000 -0500
@@ -34,7 +34,7 @@
 	ATA_MAX_PRD		= 256,	/* we could make these 256/256 */
 	ATA_SECT_SIZE		= 512,
 	ATA_SECT_SIZE_MASK	= (ATA_SECT_SIZE - 1),
-	ATA_SECT_DWORDS		= ATA_SECT_SIZE / sizeof(u32),
+	ATA_SECT_DWORDS		= ATA_SECT_SIZE / sizeof(__u32),
 
 	ATA_ID_WORDS		= 256,
 	ATA_ID_PROD_OFS		= 27,
@@ -176,31 +176,31 @@
 /* core structures */
 
 struct ata_prd {
-	u32			addr;
-	u32			flags_len;
+	__u32			addr;
+	__u32			flags_len;
 } __attribute__((packed));
 
 struct ata_taskfile {
 	unsigned long		flags;		/* ATA_TFLAG_xxx */
-	u8			protocol;	/* ATA_PROT_xxx */
+	__u8			protocol;	/* ATA_PROT_xxx */
 
-	u8			ctl;		/* control reg */
+	__u8			ctl;		/* control reg */
 
-	u8			hob_feature;	/* additional data */
-	u8			hob_nsect;	/* to support LBA48 */
-	u8			hob_lbal;
-	u8			hob_lbam;
-	u8			hob_lbah;
+	__u8			hob_feature;	/* additional data */
+	__u8			hob_nsect;	/* to support LBA48 */
+	__u8			hob_lbal;
+	__u8			hob_lbam;
+	__u8			hob_lbah;
 
-	u8			feature;
-	u8			nsect;
-	u8			lbal;
-	u8			lbam;
-	u8			lbah;
+	__u8			feature;
+	__u8			nsect;
+	__u8			lbal;
+	__u8			lbam;
+	__u8			lbah;
 
-	u8			device;
+	__u8			device;
 
-	u8			command;	/* IO operation */
+	__u8			command;	/* IO operation */
 };
 
 #define ata_id_is_ata(dev)	(((dev)->id[0] & (1 << 15)) == 0)
@@ -213,12 +213,12 @@
 #define ata_id_has_dma(dev)	((dev)->id[49] & (1 << 8))
 #define ata_id_removeable(dev)	((dev)->id[0] & (1 << 7))
 #define ata_id_u32(dev,n)	\
-	(((u32) (dev)->id[(n) + 1] << 16) | ((u32) (dev)->id[(n)]))
+	(((__u32) (dev)->id[(n) + 1] << 16) | ((__u32) (dev)->id[(n)]))
 #define ata_id_u64(dev,n)	\
-	( ((u64) dev->id[(n) + 3] << 48) |	\
-	  ((u64) dev->id[(n) + 2] << 32) |	\
-	  ((u64) dev->id[(n) + 1] << 16) |	\
-	  ((u64) dev->id[(n) + 0]) )
+	( ((__u64) dev->id[(n) + 3] << 48) |	\
+	  ((__u64) dev->id[(n) + 2] << 32) |	\
+	  ((__u64) dev->id[(n) + 1] << 16) |	\
+	  ((__u64) dev->id[(n) + 0]) )
 
 static inline int is_atapi_taskfile(struct ata_taskfile *tf)
 {
@@ -226,7 +226,7 @@
 	       (tf->protocol == ATA_PROT_ATAPI_DMA);
 }
 
-static inline int ata_ok(u8 status)
+static inline int ata_ok(__u8 status)
 {
 	return ((status & (ATA_BUSY | ATA_DRDY | ATA_DF | ATA_DRQ | ATA_ERR))
 			== ATA_DRDY);
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/bitops.h linux-libc-headers-2.6.8.0/include/linux/bitops.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/bitops.h	2004-06-09 07:00:49.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/bitops.h	2004-08-26 05:41:49.000000000 -0500
@@ -114,7 +114,7 @@
 	return generic_hweight32((unsigned int)(w >> 32)) +
 				generic_hweight32((unsigned int)w);
 #else
-	u64 res;
+	__u64 res;
 	res = (w & 0x5555555555555555ul) + ((w >> 1) & 0x5555555555555555ul);
 	res = (res & 0x3333333333333333ul) + ((res >> 2) & 0x3333333333333333ul);
 	res = (res & 0x0F0F0F0F0F0F0F0Ful) + ((res >> 4) & 0x0F0F0F0F0F0F0F0Ful);
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/compat.h linux-libc-headers-2.6.8.0/include/linux/compat.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/compat.h	2004-06-09 07:00:49.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/compat.h	2004-08-26 05:41:49.000000000 -0500
@@ -78,9 +78,9 @@
 };
 
 struct compat_dirent {
-	u32		d_ino;
+	__u32		d_ino;
 	compat_off_t	d_off;
-	u16		d_reclen;
+	__u16		d_reclen;
 	char		d_name[256];
 };
 
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/console.h linux-libc-headers-2.6.8.0/include/linux/console.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/console.h	2004-08-18 13:16:02.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/console.h	2004-08-26 05:41:49.000000000 -0500
@@ -49,9 +49,9 @@
 	int	(*con_scrolldelta)(struct vc_data *, int);
 	int	(*con_set_origin)(struct vc_data *);
 	void	(*con_save_screen)(struct vc_data *);
-	u8	(*con_build_attr)(struct vc_data *, u8, u8, u8, u8, u8);
-	void	(*con_invert_region)(struct vc_data *, u16 *, int);
-	u16    *(*con_screen_pos)(struct vc_data *, int);
+	__u8	(*con_build_attr)(struct vc_data *, __u8, __u8, __u8, __u8, __u8);
+	void	(*con_invert_region)(struct vc_data *, __u16 *, int);
+	__u16    *(*con_screen_pos)(struct vc_data *, int);
 	unsigned long (*con_getxy)(struct vc_data *, unsigned long, int *, int *);
 };
 
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/cpufreq.h linux-libc-headers-2.6.8.0/include/linux/cpufreq.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/cpufreq.h	2004-06-23 16:52:53.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/cpufreq.h	2004-08-26 05:41:49.000000000 -0500
@@ -103,7 +103,7 @@
 	unsigned int cpu;	/* cpu nr */
 	unsigned int old;
 	unsigned int new;
-	u8 flags;		/* flags of cpufreq_driver, see below. */
+	__u8 flags;		/* flags of cpufreq_driver, see below. */
 };
 
 
@@ -120,13 +120,13 @@
 {
 #if BITS_PER_LONG == 32
 
-	u64 result = ((u64) old) * ((u64) mult);
+	__u64 result = ((__u64) old) * ((__u64) mult);
 	do_div(result, div);
 	return (unsigned long) result;
 
 #elif BITS_PER_LONG == 64
 
-	unsigned long result = old * ((u64) mult);
+	unsigned long result = old * ((__u64) mult);
 	result /= div;
 	return result;
 
@@ -178,7 +178,7 @@
 struct cpufreq_driver {
 	struct module           *owner;
 	char			name[CPUFREQ_NAME_LEN];
-	u8			flags;
+	__u8			flags;
 
 	/* needed by all drivers */
 	int	(*init)		(struct cpufreq_policy *policy);
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/cramfs_fs.h linux-libc-headers-2.6.8.0/include/linux/cramfs_fs.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/cramfs_fs.h	2004-01-05 12:42:27.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/cramfs_fs.h	2004-08-26 05:41:49.000000000 -0500
@@ -2,9 +2,9 @@
 #define __CRAMFS_H
 
 
-typedef unsigned char u8;
-typedef unsigned short u16;
-typedef unsigned int u32;
+typedef unsigned char __u8;
+typedef unsigned short __u16;
+typedef unsigned int __u32;
 
 
 #define CRAMFS_MAGIC		0x28cd3d45	/* some random number */
@@ -31,9 +31,9 @@
  * Reasonably terse representation of the inode data.
  */
 struct cramfs_inode {
-	u32 mode:CRAMFS_MODE_WIDTH, uid:CRAMFS_UID_WIDTH;
+	__u32 mode:CRAMFS_MODE_WIDTH, uid:CRAMFS_UID_WIDTH;
 	/* SIZE for device files is i_rdev */
-	u32 size:CRAMFS_SIZE_WIDTH, gid:CRAMFS_GID_WIDTH;
+	__u32 size:CRAMFS_SIZE_WIDTH, gid:CRAMFS_GID_WIDTH;
 	/* NAMELEN is the length of the file name, divided by 4 and
            rounded up.  (cramfs doesn't support hard links.) */
 	/* OFFSET: For symlinks and non-empty regular files, this
@@ -42,27 +42,27 @@
 	   see README).  For non-empty directories it is the offset
 	   (divided by 4) of the inode of the first file in that
 	   directory.  For anything else, offset is zero. */
-	u32 namelen:CRAMFS_NAMELEN_WIDTH, offset:CRAMFS_OFFSET_WIDTH;
+	__u32 namelen:CRAMFS_NAMELEN_WIDTH, offset:CRAMFS_OFFSET_WIDTH;
 };
 
 struct cramfs_info {
-	u32 crc;
-	u32 edition;
-	u32 blocks;
-	u32 files;
+	__u32 crc;
+	__u32 edition;
+	__u32 blocks;
+	__u32 files;
 };
 
 /*
  * Superblock information at the beginning of the FS.
  */
 struct cramfs_super {
-	u32 magic;			/* 0x28cd3d45 - random number */
-	u32 size;			/* length in bytes */
-	u32 flags;			/* feature flags */
-	u32 future;			/* reserved for future use */
-	u8 signature[16];		/* "Compressed ROMFS" */
+	__u32 magic;			/* 0x28cd3d45 - random number */
+	__u32 size;			/* length in bytes */
+	__u32 flags;			/* feature flags */
+	__u32 future;			/* reserved for future use */
+	__u8 signature[16];		/* "Compressed ROMFS" */
 	struct cramfs_info fsid;	/* unique filesystem info */
-	u8 name[16];			/* user-defined name */
+	__u8 name[16];			/* user-defined name */
 	struct cramfs_inode root;	/* root inode data */
 };
 
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/crc32.h linux-libc-headers-2.6.8.0/include/linux/crc32.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/crc32.h	2003-12-15 12:46:57.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/crc32.h	2004-08-26 05:41:49.000000000 -0500
@@ -7,9 +7,9 @@
 
 #include <linux/types.h>
 
-extern u32  crc32_le(u32 crc, unsigned char const *p, size_t len);
-extern u32  crc32_be(u32 crc, unsigned char const *p, size_t len);
-extern u32  bitreverse(u32 in);
+extern __u32  crc32_le(__u32 crc, unsigned char const *p, size_t len);
+extern __u32  crc32_be(__u32 crc, unsigned char const *p, size_t len);
+extern __u32  bitreverse(__u32 in);
 
 #define crc32(seed, data, length)  crc32_le(seed, (unsigned char const *)data, length)
 
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/crypto.h linux-libc-headers-2.6.8.0/include/linux/crypto.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/crypto.h	2004-04-19 16:13:51.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/crypto.h	2004-08-26 05:41:49.000000000 -0500
@@ -63,28 +63,28 @@
 struct cipher_alg {
 	unsigned int cia_min_keysize;
 	unsigned int cia_max_keysize;
-	int (*cia_setkey)(void *ctx, const u8 *key,
-	                  unsigned int keylen, u32 *flags);
-	void (*cia_encrypt)(void *ctx, u8 *dst, const u8 *src);
-	void (*cia_decrypt)(void *ctx, u8 *dst, const u8 *src);
+	int (*cia_setkey)(void *ctx, const __u8 *key,
+	                  unsigned int keylen, __u32 *flags);
+	void (*cia_encrypt)(void *ctx, __u8 *dst, const __u8 *src);
+	void (*cia_decrypt)(void *ctx, __u8 *dst, const __u8 *src);
 };
 
 struct digest_alg {
 	unsigned int dia_digestsize;
 	void (*dia_init)(void *ctx);
-	void (*dia_update)(void *ctx, const u8 *data, unsigned int len);
-	void (*dia_final)(void *ctx, u8 *out);
-	int (*dia_setkey)(void *ctx, const u8 *key,
-	                  unsigned int keylen, u32 *flags);
+	void (*dia_update)(void *ctx, const __u8 *data, unsigned int len);
+	void (*dia_final)(void *ctx, __u8 *out);
+	int (*dia_setkey)(void *ctx, const __u8 *key,
+	                  unsigned int keylen, __u32 *flags);
 };
 
 struct compress_alg {
 	int (*coa_init)(void *ctx);
 	void (*coa_exit)(void *ctx);
-	int (*coa_compress)(void *ctx, const u8 *src, unsigned int slen,
-	                    u8 *dst, unsigned int *dlen);
-	int (*coa_decompress)(void *ctx, const u8 *src, unsigned int slen,
-	                      u8 *dst, unsigned int *dlen);
+	int (*coa_compress)(void *ctx, const __u8 *src, unsigned int slen,
+	                    __u8 *dst, unsigned int *dlen);
+	int (*coa_decompress)(void *ctx, const __u8 *src, unsigned int slen,
+	                      __u8 *dst, unsigned int *dlen);
 };
 
 #define cra_cipher	cra_u.cipher
@@ -93,7 +93,7 @@
 
 struct crypto_alg {
 	struct list_head cra_list;
-	u32 cra_flags;
+	__u32 cra_flags;
 	unsigned int cra_blocksize;
 	unsigned int cra_ctxsize;
 	const char cra_name[CRYPTO_MAX_ALG_NAME];
@@ -116,7 +116,7 @@
 /*
  * Algorithm query interface.
  */
-int crypto_alg_available(const char *name, u32 flags);
+int crypto_alg_available(const char *name, __u32 flags);
 
 /*
  * Transforms: user-instantiated objects which encapsulate algorithms
@@ -128,9 +128,9 @@
 struct cipher_tfm {
 	void *cit_iv;
 	unsigned int cit_ivsize;
-	u32 cit_mode;
+	__u32 cit_mode;
 	int (*cit_setkey)(struct crypto_tfm *tfm,
-	                  const u8 *key, unsigned int keylen);
+	                  const __u8 *key, unsigned int keylen);
 	int (*cit_encrypt)(struct crypto_tfm *tfm,
 			   struct scatterlist *dst,
 			   struct scatterlist *src,
@@ -138,7 +138,7 @@
 	int (*cit_encrypt_iv)(struct crypto_tfm *tfm,
 	                      struct scatterlist *dst,
 	                      struct scatterlist *src,
-	                      unsigned int nbytes, u8 *iv);
+	                      unsigned int nbytes, __u8 *iv);
 	int (*cit_decrypt)(struct crypto_tfm *tfm,
 			   struct scatterlist *dst,
 			   struct scatterlist *src,
@@ -146,19 +146,19 @@
 	int (*cit_decrypt_iv)(struct crypto_tfm *tfm,
 			   struct scatterlist *dst,
 			   struct scatterlist *src,
-			   unsigned int nbytes, u8 *iv);
-	void (*cit_xor_block)(u8 *dst, const u8 *src);
+			   unsigned int nbytes, __u8 *iv);
+	void (*cit_xor_block)(__u8 *dst, const __u8 *src);
 };
 
 struct digest_tfm {
 	void (*dit_init)(struct crypto_tfm *tfm);
 	void (*dit_update)(struct crypto_tfm *tfm,
 	                   struct scatterlist *sg, unsigned int nsg);
-	void (*dit_final)(struct crypto_tfm *tfm, u8 *out);
+	void (*dit_final)(struct crypto_tfm *tfm, __u8 *out);
 	void (*dit_digest)(struct crypto_tfm *tfm, struct scatterlist *sg,
-	                   unsigned int nsg, u8 *out);
+	                   unsigned int nsg, __u8 *out);
 	int (*dit_setkey)(struct crypto_tfm *tfm,
-	                  const u8 *key, unsigned int keylen);
+	                  const __u8 *key, unsigned int keylen);
 #ifdef CONFIG_CRYPTO_HMAC
 	void *dit_hmac_block;
 #endif
@@ -166,11 +166,11 @@
 
 struct compress_tfm {
 	int (*cot_compress)(struct crypto_tfm *tfm,
-	                    const u8 *src, unsigned int slen,
-	                    u8 *dst, unsigned int *dlen);
+	                    const __u8 *src, unsigned int slen,
+	                    __u8 *dst, unsigned int *dlen);
 	int (*cot_decompress)(struct crypto_tfm *tfm,
-	                      const u8 *src, unsigned int slen,
-	                      u8 *dst, unsigned int *dlen);
+	                      const __u8 *src, unsigned int slen,
+	                      __u8 *dst, unsigned int *dlen);
 };
 
 #define crt_cipher	crt_u.cipher
@@ -179,7 +179,7 @@
 
 struct crypto_tfm {
 
-	u32 crt_flags;
+	__u32 crt_flags;
 	
 	union {
 		struct cipher_tfm cipher;
@@ -203,7 +203,7 @@
  * crypto_free_tfm() frees up the transform and any associated resources,
  * then drops the refcount on the associated algorithm.
  */
-struct crypto_tfm *crypto_alloc_tfm(const char *alg_name, u32 tfm_flags);
+struct crypto_tfm *crypto_alloc_tfm(const char *alg_name, __u32 tfm_flags);
 void crypto_free_tfm(struct crypto_tfm *tfm);
 
 /*
@@ -219,7 +219,7 @@
 	return module_name(tfm->__crt_alg->cra_module);
 }
 
-static inline u32 crypto_tfm_alg_type(struct crypto_tfm *tfm)
+static inline __u32 crypto_tfm_alg_type(struct crypto_tfm *tfm)
 {
 	return tfm->__crt_alg->cra_flags & CRYPTO_ALG_TYPE_MASK;
 }
@@ -270,7 +270,7 @@
 	tfm->crt_digest.dit_update(tfm, sg, nsg);
 }
 
-static inline void crypto_digest_final(struct crypto_tfm *tfm, u8 *out)
+static inline void crypto_digest_final(struct crypto_tfm *tfm, __u8 *out)
 {
 	BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST);
 	tfm->crt_digest.dit_final(tfm, out);
@@ -278,14 +278,14 @@
 
 static inline void crypto_digest_digest(struct crypto_tfm *tfm,
                                         struct scatterlist *sg,
-                                        unsigned int nsg, u8 *out)
+                                        unsigned int nsg, __u8 *out)
 {
 	BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST);
 	tfm->crt_digest.dit_digest(tfm, sg, nsg, out);
 }
 
 static inline int crypto_digest_setkey(struct crypto_tfm *tfm,
-                                       const u8 *key, unsigned int keylen)
+                                       const __u8 *key, unsigned int keylen)
 {
 	BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST);
 	if (tfm->crt_digest.dit_setkey == NULL)
@@ -294,7 +294,7 @@
 }
 
 static inline int crypto_cipher_setkey(struct crypto_tfm *tfm,
-                                       const u8 *key, unsigned int keylen)
+                                       const __u8 *key, unsigned int keylen)
 {
 	BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
 	return tfm->crt_cipher.cit_setkey(tfm, key, keylen);
@@ -312,7 +312,7 @@
 static inline int crypto_cipher_encrypt_iv(struct crypto_tfm *tfm,
                                            struct scatterlist *dst,
                                            struct scatterlist *src,
-                                           unsigned int nbytes, u8 *iv)
+                                           unsigned int nbytes, __u8 *iv)
 {
 	BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
 	BUG_ON(tfm->crt_cipher.cit_mode == CRYPTO_TFM_MODE_ECB);
@@ -331,7 +331,7 @@
 static inline int crypto_cipher_decrypt_iv(struct crypto_tfm *tfm,
                                            struct scatterlist *dst,
                                            struct scatterlist *src,
-                                           unsigned int nbytes, u8 *iv)
+                                           unsigned int nbytes, __u8 *iv)
 {
 	BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
 	BUG_ON(tfm->crt_cipher.cit_mode == CRYPTO_TFM_MODE_ECB);
@@ -339,30 +339,30 @@
 }
 
 static inline void crypto_cipher_set_iv(struct crypto_tfm *tfm,
-                                        const u8 *src, unsigned int len)
+                                        const __u8 *src, unsigned int len)
 {
 	BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
 	memcpy(tfm->crt_cipher.cit_iv, src, len);
 }
 
 static inline void crypto_cipher_get_iv(struct crypto_tfm *tfm,
-                                        u8 *dst, unsigned int len)
+                                        __u8 *dst, unsigned int len)
 {
 	BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
 	memcpy(dst, tfm->crt_cipher.cit_iv, len);
 }
 
 static inline int crypto_comp_compress(struct crypto_tfm *tfm,
-                                       const u8 *src, unsigned int slen,
-                                       u8 *dst, unsigned int *dlen)
+                                       const __u8 *src, unsigned int slen,
+                                       __u8 *dst, unsigned int *dlen)
 {
 	BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_COMPRESS);
 	return tfm->crt_compress.cot_compress(tfm, src, slen, dst, dlen);
 }
 
 static inline int crypto_comp_decompress(struct crypto_tfm *tfm,
-                                         const u8 *src, unsigned int slen,
-                                         u8 *dst, unsigned int *dlen)
+                                         const __u8 *src, unsigned int slen,
+                                         __u8 *dst, unsigned int *dlen)
 {
 	BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_COMPRESS);
 	return tfm->crt_compress.cot_decompress(tfm, src, slen, dst, dlen);
@@ -372,13 +372,13 @@
  * HMAC support.
  */
 #ifdef CONFIG_CRYPTO_HMAC
-void crypto_hmac_init(struct crypto_tfm *tfm, u8 *key, unsigned int *keylen);
+void crypto_hmac_init(struct crypto_tfm *tfm, __u8 *key, unsigned int *keylen);
 void crypto_hmac_update(struct crypto_tfm *tfm,
                         struct scatterlist *sg, unsigned int nsg);
-void crypto_hmac_final(struct crypto_tfm *tfm, u8 *key,
-                       unsigned int *keylen, u8 *out);
-void crypto_hmac(struct crypto_tfm *tfm, u8 *key, unsigned int *keylen,
-                 struct scatterlist *sg, unsigned int nsg, u8 *out);
+void crypto_hmac_final(struct crypto_tfm *tfm, __u8 *key,
+                       unsigned int *keylen, __u8 *out);
+void crypto_hmac(struct crypto_tfm *tfm, __u8 *key, unsigned int *keylen,
+                 struct scatterlist *sg, unsigned int nsg, __u8 *out);
 #endif	/* CONFIG_CRYPTO_HMAC */
 
 #endif	/* _LINUX_CRYPTO_H */
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/cycx_drv.h linux-libc-headers-2.6.8.0/include/linux/cycx_drv.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/cycx_drv.h	2003-12-15 12:46:57.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/cycx_drv.h	2004-08-26 05:41:49.000000000 -0500
@@ -14,9 +14,9 @@
 * ============================================================================
 * 1999/10/23	acme		cycxhw_t cleanup
 * 1999/01/03	acme		more judicious use of data types...
-*				uclong, ucchar, etc deleted, the u8, u16, u32
+*				uclong, ucchar, etc deleted, the __u8, __u16, __u32
 *				types are the portable way to go.
-* 1999/01/03	acme		judicious use of data types... u16, u32, etc
+* 1999/01/03	acme		judicious use of data types... __u16, __u32, etc
 * 1998/12/26	acme	 	FIXED_BUFFERS, CONF_OFFSET,
 *                               removal of cy_read{bwl}
 * 1998/08/08	acme	 	Initial version.
@@ -46,18 +46,18 @@
  *	@reserved - reserved for future use
  */
 struct cycx_hw {
-	u32 fwid;
+	__u32 fwid;
 	int irq;
 	void *dpmbase;
-	u32 dpmsize;
-	u32 reserved[5];
+	__u32 dpmsize;
+	__u32 reserved[5];
 };
 
 /* Function Prototypes */
-extern int cycx_setup(struct cycx_hw *hw, void *sfm, u32 len);
+extern int cycx_setup(struct cycx_hw *hw, void *sfm, __u32 len);
 extern int cycx_down(struct cycx_hw *hw);
-extern int cycx_peek(struct cycx_hw *hw, u32 addr, void *buf, u32 len);
-extern int cycx_poke(struct cycx_hw *hw, u32 addr, void *buf, u32 len);
+extern int cycx_peek(struct cycx_hw *hw, __u32 addr, void *buf, __u32 len);
+extern int cycx_poke(struct cycx_hw *hw, __u32 addr, void *buf, __u32 len);
 extern int cycx_exec(void *addr);
 
 extern void cycx_inten(struct cycx_hw *hw);
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/cycx_x25.h linux-libc-headers-2.6.8.0/include/linux/cycx_x25.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/cycx_x25.h	2003-12-15 12:46:58.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/cycx_x25.h	2004-08-26 05:41:49.000000000 -0500
@@ -38,10 +38,10 @@
 /* Data Structures */
 /* X.25 Command Block. */
 struct cycx_x25_cmd {
-	u16 command PACKED;
-	u16 link    PACKED; /* values: 0 or 1 */
-	u16 len     PACKED; /* values: 0 thru 0x205 (517) */
-	u32 buf     PACKED;
+	__u16 command PACKED;
+	__u16 link    PACKED; /* values: 0 or 1 */
+	__u16 len     PACKED; /* values: 0 thru 0x205 (517) */
+	__u32 buf     PACKED;
 };
 
 /* Defines for the 'command' field. */
@@ -92,34 +92,34 @@
  *	@flags - see dosx25.doc, in portuguese, for details
  */
 struct cycx_x25_config {
-	u8  link	PACKED;
-	u8  speed	PACKED;
-	u8  clock	PACKED;
-	u8  n2		PACKED;
-	u8  n2win	PACKED;
-	u8  n3win	PACKED;
-	u8  nvc		PACKED;
-	u8  pktlen	PACKED;
-	u8  locaddr	PACKED;
-	u8  remaddr	PACKED;
-	u16 t1		PACKED;
-	u16 t2		PACKED;
-	u8  t21		PACKED;
-	u8  npvc	PACKED;
-	u8  t23		PACKED;
-	u8  flags	PACKED;
+	__u8  link	PACKED;
+	__u8  speed	PACKED;
+	__u8  clock	PACKED;
+	__u8  n2		PACKED;
+	__u8  n2win	PACKED;
+	__u8  n3win	PACKED;
+	__u8  nvc		PACKED;
+	__u8  pktlen	PACKED;
+	__u8  locaddr	PACKED;
+	__u8  remaddr	PACKED;
+	__u16 t1		PACKED;
+	__u16 t2		PACKED;
+	__u8  t21		PACKED;
+	__u8  npvc	PACKED;
+	__u8  t23		PACKED;
+	__u8  flags	PACKED;
 };
 
 struct cycx_x25_stats {
-	u16 rx_crc_errors	PACKED;
-	u16 rx_over_errors	PACKED;
-	u16 n2_tx_frames 	PACKED;
-	u16 n2_rx_frames 	PACKED;
-	u16 tx_timeouts 	PACKED;
-	u16 rx_timeouts 	PACKED;
-	u16 n3_tx_packets 	PACKED;
-	u16 n3_rx_packets 	PACKED;
-	u16 tx_aborts	 	PACKED;
-	u16 rx_aborts	 	PACKED;
+	__u16 rx_crc_errors	PACKED;
+	__u16 rx_over_errors	PACKED;
+	__u16 n2_tx_frames 	PACKED;
+	__u16 n2_rx_frames 	PACKED;
+	__u16 tx_timeouts 	PACKED;
+	__u16 rx_timeouts 	PACKED;
+	__u16 n3_tx_packets 	PACKED;
+	__u16 n3_rx_packets 	PACKED;
+	__u16 tx_aborts	 	PACKED;
+	__u16 rx_aborts	 	PACKED;
 };
 #endif	/* _CYCX_X25_H */
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/device.h linux-libc-headers-2.6.8.0/include/linux/device.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/device.h	2004-08-18 13:16:02.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/device.h	2004-08-26 05:41:49.000000000 -0500
@@ -57,7 +57,7 @@
 	struct device * (*add)	(struct device * parent, char * bus_id);
 	int		(*hotplug) (struct device *dev, char **envp, 
 				    int num_envp, char *buffer, int buffer_size);
-	int		(*suspend)(struct device * dev, u32 state);
+	int		(*suspend)(struct device * dev, __u32 state);
 	int		(*resume)(struct device * dev);
 };
 
@@ -105,8 +105,8 @@
 	int	(*probe)	(struct device * dev);
 	int 	(*remove)	(struct device * dev);
 	void	(*shutdown)	(struct device * dev);
-	int	(*suspend)	(struct device * dev, u32 state, u32 level);
-	int	(*resume)	(struct device * dev, u32 level);
+	int	(*suspend)	(struct device * dev, __u32 state, __u32 level);
+	int	(*resume)	(struct device * dev, __u32 level);
 };
 
 
@@ -262,17 +262,17 @@
 	void		*platform_data;	/* Platform specific data (e.g. ACPI,
 					   BIOS data relevant to device) */
 	struct dev_pm_info	power;
-	u32		power_state;	/* Current operating state. In
+	__u32		power_state;	/* Current operating state. In
 					   ACPI-speak, this is D0-D3, D0
 					   being fully functional, and D3
 					   being off. */
 
 	unsigned char *saved_state;	/* saved device state */
-	u32		detach_state;	/* State to enter when device is
+	__u32		detach_state;	/* State to enter when device is
 					   detached from its driver. */
 
-	u64		*dma_mask;	/* dma mask (if dma'able device) */
-	u64		coherent_dma_mask;/* Like dma_mask, but for
+	__u64		*dma_mask;	/* dma mask (if dma'able device) */
+	__u64		coherent_dma_mask;/* Like dma_mask, but for
 					     alloc_coherent mappings as
 					     not all hardware supports
 					     64 bit addresses for consistent
@@ -360,9 +360,9 @@
 
 struct platform_device {
 	char		* name;
-	u32		id;
+	__u32		id;
 	struct device	dev;
-	u32		num_resources;
+	__u32		num_resources;
 	struct resource	* resource;
 };
 
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/divert.h linux-libc-headers-2.6.8.0/include/linux/divert.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/divert.h	2004-06-09 07:00:49.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/divert.h	2004-08-26 05:41:49.000000000 -0500
@@ -27,10 +27,10 @@
 {
 	int		divert;  /* are we active */
 	unsigned int protos;	/* protocols */
-	u16		tcp_dst[MAX_DIVERT_PORTS]; /* specific tcp dst ports to divert */
-	u16		tcp_src[MAX_DIVERT_PORTS]; /* specific tcp src ports to divert */
-	u16		udp_dst[MAX_DIVERT_PORTS]; /* specific udp dst ports to divert */
-	u16		udp_src[MAX_DIVERT_PORTS]; /* specific udp src ports to divert */
+	__u16		tcp_dst[MAX_DIVERT_PORTS]; /* specific tcp dst ports to divert */
+	__u16		tcp_src[MAX_DIVERT_PORTS]; /* specific tcp src ports to divert */
+	__u16		udp_dst[MAX_DIVERT_PORTS]; /* specific udp dst ports to divert */
+	__u16		udp_src[MAX_DIVERT_PORTS]; /* specific udp src ports to divert */
 };
 
 /*
@@ -40,12 +40,12 @@
 
 typedef union _divert_cf_arg
 {
-	s16		int16;
-	u16		uint16;
-	s32		int32;
-	u32		uint32;
-	s64		int64;
-	u64		uint64;
+	__s16		int16;
+	__u16		uint16;
+	__s32		int32;
+	__u32		uint32;
+	__s64		int64;
+	__u64		uint64;
 	void	*ptr;
 } divert_cf_arg;
 
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/eeprom.h linux-libc-headers-2.6.8.0/include/linux/eeprom.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/eeprom.h	2003-12-19 07:05:15.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/eeprom.h	2004-08-26 13:26:38.000000000 -0500
@@ -26,15 +26,15 @@
 	unsigned	ee_state;
 
 	spinlock_t	*lock;
-	u32		*cache;
+	__u32		*cache;
 };
 
 
-u8   eeprom_readb(struct eeprom *ee, unsigned address);
-void eeprom_read(struct eeprom *ee, unsigned address, u8 *bytes,
+__u8   eeprom_readb(struct eeprom *ee, unsigned address);
+void eeprom_read(struct eeprom *ee, unsigned address, __u8 *bytes,
 		unsigned count);
-void eeprom_writeb(struct eeprom *ee, unsigned address, u8 data);
-void eeprom_write(struct eeprom *ee, unsigned address, u8 *bytes,
+void eeprom_writeb(struct eeprom *ee, unsigned address, __u8 data);
+void eeprom_write(struct eeprom *ee, unsigned address, __u8 *bytes,
 		unsigned count);
 
 /* The EEPROM commands include the alway-set leading bit. */
@@ -56,10 +56,10 @@
 }
 
 /* foo. put this in a .c file */
-static inline void eeprom_update(struct eeprom *ee, u32 mask, int pol)
+static inline void eeprom_update(struct eeprom *ee, __u32 mask, int pol)
 {
 	unsigned long flags;
-	u32 data;
+	__u32 data;
 
 	spin_lock_irqsave(ee->lock, flags);
 	data = *ee->cache;
@@ -106,17 +106,17 @@
 	eeprom_update(ee, ee->eedi, pol);
 }
 
-u16   eeprom_readw(struct eeprom *ee, unsigned address)
+__u16   eeprom_readw(struct eeprom *ee, unsigned address)
 {
 	unsigned i;
-	u16	res = 0;
+	__u16	res = 0;
 
 	eeprom_clk_lo(ee);
 	eeprom_update(ee, ee->eesel, 1 ^ !!(ee->polarity & EEPOL_EESEL));
 	eeprom_send_addr(ee, address);
 
 	for (i=0; i<16; i++) {
-		u32 data;
+		__u32 data;
 		eeprom_clk_hi(ee);
 		res <<= 1;
 		data = readl(ee->addr);
@@ -130,6 +130,6 @@
 }
 
 
-void eeprom_writeb(struct eeprom *ee, unsigned address, u8 data)
+void eeprom_writeb(struct eeprom *ee, unsigned address, __u8 data)
 {
 }
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/efi.h linux-libc-headers-2.6.8.0/include/linux/efi.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/efi.h	2004-08-18 13:16:02.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/efi.h	2004-08-26 05:42:08.000000000 -0500
@@ -30,12 +30,12 @@
 #define EFI_NOT_FOUND		(14 | (1UL << (BITS_PER_LONG-1)))
 
 typedef unsigned long efi_status_t;
-typedef u8 efi_bool_t;
-typedef u16 efi_char16_t;		/* UNICODE character */
+typedef __u8 efi_bool_t;
+typedef __u16 efi_char16_t;		/* UNICODE character */
 
 
 typedef struct {
-	u8 b[16];
+	__u8 b[16];
 } efi_guid_t;
 
 #define EFI_GUID(a,b,c,d0,d1,d2,d3,d4,d5,d6,d7) \
@@ -49,11 +49,11 @@
  * Generic EFI table header
  */
 typedef	struct {
-	u64 signature;
-	u32 revision;
-	u32 headersize;
-	u32 crc32;
-	u32 reserved;
+	__u64 signature;
+	__u32 revision;
+	__u32 headersize;
+	__u32 crc32;
+	__u32 reserved;
 } efi_table_hdr_t;
 
 /*
@@ -78,14 +78,14 @@
 #define EFI_MAX_MEMORY_TYPE		14
 
 /* Attribute values: */
-#define EFI_MEMORY_UC		((u64)0x0000000000000001ULL)	/* uncached */
-#define EFI_MEMORY_WC		((u64)0x0000000000000002ULL)	/* write-coalescing */
-#define EFI_MEMORY_WT		((u64)0x0000000000000004ULL)	/* write-through */
-#define EFI_MEMORY_WB		((u64)0x0000000000000008ULL)	/* write-back */
-#define EFI_MEMORY_WP		((u64)0x0000000000001000ULL)	/* write-protect */
-#define EFI_MEMORY_RP		((u64)0x0000000000002000ULL)	/* read-protect */
-#define EFI_MEMORY_XP		((u64)0x0000000000004000ULL)	/* execute-protect */
-#define EFI_MEMORY_RUNTIME	((u64)0x8000000000000000ULL)	/* range requires runtime mapping */
+#define EFI_MEMORY_UC		((__u64)0x0000000000000001ULL)	/* uncached */
+#define EFI_MEMORY_WC		((__u64)0x0000000000000002ULL)	/* write-coalescing */
+#define EFI_MEMORY_WT		((__u64)0x0000000000000004ULL)	/* write-through */
+#define EFI_MEMORY_WB		((__u64)0x0000000000000008ULL)	/* write-back */
+#define EFI_MEMORY_WP		((__u64)0x0000000000001000ULL)	/* write-protect */
+#define EFI_MEMORY_RP		((__u64)0x0000000000002000ULL)	/* read-protect */
+#define EFI_MEMORY_XP		((__u64)0x0000000000004000ULL)	/* execute-protect */
+#define EFI_MEMORY_RUNTIME	((__u64)0x8000000000000000ULL)	/* range requires runtime mapping */
 #define EFI_MEMORY_DESCRIPTOR_VERSION	1
 
 #define EFI_PAGE_SHIFT		12
@@ -96,14 +96,14 @@
  * the case in ia64.  Need to have this fixed in the f/w.
  */
 typedef struct {
-	u32 type;
-	u32 pad;
-	u64 phys_addr;
-	u64 virt_addr;
-	u64 num_pages;
-	u64 attribute;
+	__u32 type;
+	__u32 pad;
+	__u64 phys_addr;
+	__u64 virt_addr;
+	__u64 num_pages;
+	__u64 attribute;
 #if defined (__i386__)
-	u64 pad1;
+	__u64 pad1;
 #endif
 } efi_memory_desc_t;
 
@@ -117,23 +117,23 @@
 #define EFI_UNSPECIFIED_TIMEZONE 0x07ff
 
 typedef struct {
-	u16 year;
-	u8 month;
-	u8 day;
-	u8 hour;
-	u8 minute;
-	u8 second;
-	u8 pad1;
-	u32 nanosecond;
-	s16 timezone;
-	u8 daylight;
-	u8 pad2;
+	__u16 year;
+	__u8 month;
+	__u8 day;
+	__u8 hour;
+	__u8 minute;
+	__u8 second;
+	__u8 pad1;
+	__u32 nanosecond;
+	__s16 timezone;
+	__u8 daylight;
+	__u8 pad2;
 } efi_time_t;
 
 typedef struct {
-	u32 resolution;
-	u32 accuracy;
-	u8 sets_to_zero;
+	__u32 resolution;
+	__u32 accuracy;
+	__u8 sets_to_zero;
 } efi_time_cap_t;
 
 /*
@@ -146,7 +146,7 @@
 /*
  * EFI Runtime Services table
  */
-#define EFI_RUNTIME_SERVICES_SIGNATURE ((u64)0x5652453544e5552ULL)
+#define EFI_RUNTIME_SERVICES_SIGNATURE ((__u64)0x5652453544e5552ULL)
 #define EFI_RUNTIME_SERVICES_REVISION  0x00010000
 
 typedef struct {
@@ -169,19 +169,19 @@
 typedef efi_status_t efi_get_wakeup_time_t (efi_bool_t *enabled, efi_bool_t *pending,
 					    efi_time_t *tm);
 typedef efi_status_t efi_set_wakeup_time_t (efi_bool_t enabled, efi_time_t *tm);
-typedef efi_status_t efi_get_variable_t (efi_char16_t *name, efi_guid_t *vendor, u32 *attr,
+typedef efi_status_t efi_get_variable_t (efi_char16_t *name, efi_guid_t *vendor, __u32 *attr,
 					 unsigned long *data_size, void *data);
 typedef efi_status_t efi_get_next_variable_t (unsigned long *name_size, efi_char16_t *name,
 					      efi_guid_t *vendor);
 typedef efi_status_t efi_set_variable_t (efi_char16_t *name, efi_guid_t *vendor, 
 					 unsigned long attr, unsigned long data_size, 
 					 void *data);
-typedef efi_status_t efi_get_next_high_mono_count_t (u32 *count);
+typedef efi_status_t efi_get_next_high_mono_count_t (__u32 *count);
 typedef void efi_reset_system_t (int reset_type, efi_status_t status,
 				 unsigned long data_size, efi_char16_t *data);
 typedef efi_status_t efi_set_virtual_address_map_t (unsigned long memory_map_size,
 						unsigned long descriptor_size,
-						u32 descriptor_version,
+						__u32 descriptor_version,
 						efi_memory_desc_t *virtual_map);
 
 /*
@@ -219,13 +219,13 @@
 	unsigned long table;
 } efi_config_table_t;
 
-#define EFI_SYSTEM_TABLE_SIGNATURE ((u64)0x5453595320494249ULL)
+#define EFI_SYSTEM_TABLE_SIGNATURE ((__u64)0x5453595320494249ULL)
 #define EFI_SYSTEM_TABLE_REVISION  ((1 << 16) | 00)
 
 typedef struct {
 	efi_table_hdr_t hdr;
 	unsigned long fw_vendor;	/* physical addr of CHAR16 vendor string */
-	u32 fw_revision;
+	__u32 fw_revision;
 	unsigned long con_in_handle;
 	unsigned long con_in;
 	unsigned long con_out_handle;
@@ -293,9 +293,9 @@
 extern void efi_memmap_walk (efi_freemem_callback_t callback, void *arg);
 extern void efi_gettimeofday (struct timespec *ts);
 extern void efi_enter_virtual_mode (void);	/* switch EFI to virtual mode, if possible */
-extern u64 efi_get_iobase (void);
-extern u32 efi_mem_type (unsigned long phys_addr);
-extern u64 efi_mem_attributes (unsigned long phys_addr);
+extern __u64 efi_get_iobase (void);
+extern __u32 efi_mem_type (unsigned long phys_addr);
+extern __u64 efi_mem_attributes (unsigned long phys_addr);
 extern int __init efi_uart_console_only (void);
 extern void efi_initialize_iomem_resources(struct resource *code_resource,
 					struct resource *data_resource);
@@ -368,9 +368,9 @@
 #define   EFI_DEV_END_ENTIRE			0xFF
 
 struct efi_generic_dev_path {
-	u8 type;
-	u8 sub_type;
-	u16 length;
+	__u8 type;
+	__u8 sub_type;
+	__u16 length;
 } __attribute ((packed));
 
 #endif /* _LINUX_EFI_H */
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/eisa.h linux-libc-headers-2.6.8.0/include/linux/eisa.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/eisa.h	2003-12-15 12:46:58.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/eisa.h	2004-08-26 05:42:08.000000000 -0500
@@ -43,7 +43,7 @@
 	int                   state;
 	unsigned long         base_addr;
 	struct resource       res[EISA_MAX_RESOURCES];
-	u64                   dma_mask;
+	__u64                   dma_mask;
 	struct device         dev; /* generic device */
 #ifdef CONFIG_EISA_NAMES
 	char		      pretty_name[DEVICE_NAME_SIZE];
@@ -91,7 +91,7 @@
 	unsigned long    bus_base_addr;
 	int		 slots;  /* Max slot number */
 	int		 force_probe; /* Probe even when no slot 0 */
-	u64		 dma_mask; /* from bridge device */
+	__u64		 dma_mask; /* from bridge device */
 	int              bus_nr; /* Set by eisa_root_register */
 	struct resource  eisa_root_res;	/* ditto */
 };
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/ethtool.h linux-libc-headers-2.6.8.0/include/linux/ethtool.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/ethtool.h	2004-06-23 16:52:54.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/ethtool.h	2004-08-26 13:29:11.000000000 -0500
@@ -15,24 +15,24 @@
 
 /* This should work for both 32 and 64 bit userland. */
 struct ethtool_cmd {
-	u32	cmd;
-	u32	supported;	/* Features this interface supports */
-	u32	advertising;	/* Features this interface advertises */
-	u16	speed;		/* The forced speed, 10Mb, 100Mb, gigabit */
-	u8	duplex;		/* Duplex, half or full */
-	u8	port;		/* Which connector port */
-	u8	phy_address;
-	u8	transceiver;	/* Which transceiver to use */
-	u8	autoneg;	/* Enable or disable autonegotiation */
-	u32	maxtxpkt;	/* Tx pkts before generating tx int */
-	u32	maxrxpkt;	/* Rx pkts before generating rx int */
-	u32	reserved[4];
+	__u32	cmd;
+	__u32	supported;	/* Features this interface supports */
+	__u32	advertising;	/* Features this interface advertises */
+	__u16	speed;		/* The forced speed, 10Mb, 100Mb, gigabit */
+	__u8	duplex;		/* Duplex, half or full */
+	__u8	port;		/* Which connector port */
+	__u8	phy_address;
+	__u8	transceiver;	/* Which transceiver to use */
+	__u8	autoneg;	/* Enable or disable autonegotiation */
+	__u32	maxtxpkt;	/* Tx pkts before generating tx int */
+	__u32	maxrxpkt;	/* Rx pkts before generating rx int */
+	__u32	reserved[4];
 };
 
 #define ETHTOOL_BUSINFO_LEN	32
 /* these strings are set to whatever the driver author decides... */
 struct ethtool_drvinfo {
-	u32	cmd;
+	__u32	cmd;
 	char	driver[32];	/* driver short name, "tulip", "eepro100" */
 	char	version[32];	/* driver version string */
 	char	fw_version[32];	/* firmware version string, if applicable */
@@ -40,53 +40,53 @@
 				/* For PCI devices, use pci_name(pci_dev). */
 	char	reserved1[32];
 	char	reserved2[16];
-	u32	n_stats;	/* number of u64's from ETHTOOL_GSTATS */
-	u32	testinfo_len;
-	u32	eedump_len;	/* Size of data from ETHTOOL_GEEPROM (bytes) */
-	u32	regdump_len;	/* Size of data from ETHTOOL_GREGS (bytes) */
+	__u32	n_stats;	/* number of __u64's from ETHTOOL_GSTATS */
+	__u32	testinfo_len;
+	__u32	eedump_len;	/* Size of data from ETHTOOL_GEEPROM (bytes) */
+	__u32	regdump_len;	/* Size of data from ETHTOOL_GREGS (bytes) */
 };
 
 #define SOPASS_MAX	6
 /* wake-on-lan settings */
 struct ethtool_wolinfo {
-	u32	cmd;
-	u32	supported;
-	u32	wolopts;
-	u8	sopass[SOPASS_MAX]; /* SecureOn(tm) password */
+	__u32	cmd;
+	__u32	supported;
+	__u32	wolopts;
+	__u8	sopass[SOPASS_MAX]; /* SecureOn(tm) password */
 };
 
 /* for passing single values */
 struct ethtool_value {
-	u32	cmd;
-	u32	data;
+	__u32	cmd;
+	__u32	data;
 };
 
 /* for passing big chunks of data */
 struct ethtool_regs {
-	u32	cmd;
-	u32	version; /* driver-specific, indicates different chips/revs */
-	u32	len; /* bytes */
-	u8	data[0];
+	__u32	cmd;
+	__u32	version; /* driver-specific, indicates different chips/revs */
+	__u32	len; /* bytes */
+	__u8	data[0];
 };
 
 /* for passing EEPROM chunks */
 struct ethtool_eeprom {
-	u32	cmd;
-	u32	magic;
-	u32	offset; /* in bytes */
-	u32	len; /* in bytes */
-	u8	data[0];
+	__u32	cmd;
+	__u32	magic;
+	__u32	offset; /* in bytes */
+	__u32	len; /* in bytes */
+	__u8	data[0];
 };
 
 /* for configuring coalescing parameters of chip */
 struct ethtool_coalesce {
-	u32	cmd;	/* ETHTOOL_{G,S}COALESCE */
+	__u32	cmd;	/* ETHTOOL_{G,S}COALESCE */
 
 	/* How many usecs to delay an RX interrupt after
 	 * a packet arrives.  If 0, only rx_max_coalesced_frames
 	 * is used.
 	 */
-	u32	rx_coalesce_usecs;
+	__u32	rx_coalesce_usecs;
 
 	/* How many packets to delay an RX interrupt after
 	 * a packet arrives.  If 0, only rx_coalesce_usecs is
@@ -94,21 +94,21 @@
 	 * to zero as this would cause RX interrupts to never be
 	 * generated.
 	 */
-	u32	rx_max_coalesced_frames;
+	__u32	rx_max_coalesced_frames;
 
 	/* Same as above two parameters, except that these values
 	 * apply while an IRQ is being serviced by the host.  Not
 	 * all cards support this feature and the values are ignored
 	 * in that case.
 	 */
-	u32	rx_coalesce_usecs_irq;
-	u32	rx_max_coalesced_frames_irq;
+	__u32	rx_coalesce_usecs_irq;
+	__u32	rx_max_coalesced_frames_irq;
 
 	/* How many usecs to delay a TX interrupt after
 	 * a packet is sent.  If 0, only tx_max_coalesced_frames
 	 * is used.
 	 */
-	u32	tx_coalesce_usecs;
+	__u32	tx_coalesce_usecs;
 
 	/* How many packets to delay a TX interrupt after
 	 * a packet is sent.  If 0, only tx_coalesce_usecs is
@@ -116,22 +116,22 @@
 	 * to zero as this would cause TX interrupts to never be
 	 * generated.
 	 */
-	u32	tx_max_coalesced_frames;
+	__u32	tx_max_coalesced_frames;
 
 	/* Same as above two parameters, except that these values
 	 * apply while an IRQ is being serviced by the host.  Not
 	 * all cards support this feature and the values are ignored
 	 * in that case.
 	 */
-	u32	tx_coalesce_usecs_irq;
-	u32	tx_max_coalesced_frames_irq;
+	__u32	tx_coalesce_usecs_irq;
+	__u32	tx_max_coalesced_frames_irq;
 
 	/* How many usecs to delay in-memory statistics
 	 * block updates.  Some drivers do not have an in-memory
 	 * statistic block, and in such cases this value is ignored.
 	 * This value must not be zero.
 	 */
-	u32	stats_block_coalesce_usecs;
+	__u32	stats_block_coalesce_usecs;
 
 	/* Adaptive RX/TX coalescing is an algorithm implemented by
 	 * some drivers to improve latency under low packet rates and
@@ -140,18 +140,18 @@
 	 * not implemented by the driver causes these values to be
 	 * silently ignored.
 	 */
-	u32	use_adaptive_rx_coalesce;
-	u32	use_adaptive_tx_coalesce;
+	__u32	use_adaptive_rx_coalesce;
+	__u32	use_adaptive_tx_coalesce;
 
 	/* When the packet rate (measured in packets per second)
 	 * is below pkt_rate_low, the {rx,tx}_*_low parameters are
 	 * used.
 	 */
-	u32	pkt_rate_low;
-	u32	rx_coalesce_usecs_low;
-	u32	rx_max_coalesced_frames_low;
-	u32	tx_coalesce_usecs_low;
-	u32	tx_max_coalesced_frames_low;
+	__u32	pkt_rate_low;
+	__u32	rx_coalesce_usecs_low;
+	__u32	rx_max_coalesced_frames_low;
+	__u32	tx_coalesce_usecs_low;
+	__u32	tx_max_coalesced_frames_low;
 
 	/* When the packet rate is below pkt_rate_high but above
 	 * pkt_rate_low (both measured in packets per second) the
@@ -162,43 +162,43 @@
 	 * is above pkt_rate_high, the {rx,tx}_*_high parameters are
 	 * used.
 	 */
-	u32	pkt_rate_high;
-	u32	rx_coalesce_usecs_high;
-	u32	rx_max_coalesced_frames_high;
-	u32	tx_coalesce_usecs_high;
-	u32	tx_max_coalesced_frames_high;
+	__u32	pkt_rate_high;
+	__u32	rx_coalesce_usecs_high;
+	__u32	rx_max_coalesced_frames_high;
+	__u32	tx_coalesce_usecs_high;
+	__u32	tx_max_coalesced_frames_high;
 
 	/* How often to do adaptive coalescing packet rate sampling,
 	 * measured in seconds.  Must not be zero.
 	 */
-	u32	rate_sample_interval;
+	__u32	rate_sample_interval;
 };
 
 /* for configuring RX/TX ring parameters */
 struct ethtool_ringparam {
-	u32	cmd;	/* ETHTOOL_{G,S}RINGPARAM */
+	__u32	cmd;	/* ETHTOOL_{G,S}RINGPARAM */
 
 	/* Read only attributes.  These indicate the maximum number
 	 * of pending RX/TX ring entries the driver will allow the
 	 * user to set.
 	 */
-	u32	rx_max_pending;
-	u32	rx_mini_max_pending;
-	u32	rx_jumbo_max_pending;
-	u32	tx_max_pending;
+	__u32	rx_max_pending;
+	__u32	rx_mini_max_pending;
+	__u32	rx_jumbo_max_pending;
+	__u32	tx_max_pending;
 
 	/* Values changeable by the user.  The valid values are
 	 * in the range 1 to the "*_max_pending" counterpart above.
 	 */
-	u32	rx_pending;
-	u32	rx_mini_pending;
-	u32	rx_jumbo_pending;
-	u32	tx_pending;
+	__u32	rx_pending;
+	__u32	rx_mini_pending;
+	__u32	rx_jumbo_pending;
+	__u32	tx_pending;
 };
 
 /* for configuring link flow control parameters */
 struct ethtool_pauseparam {
-	u32	cmd;	/* ETHTOOL_{G,S}PAUSEPARAM */
+	__u32	cmd;	/* ETHTOOL_{G,S}PAUSEPARAM */
 
 	/* If the link is being auto-negotiated (via ethtool_cmd.autoneg
 	 * being true) the user may set 'autonet' here non-zero to have the
@@ -210,9 +210,9 @@
 	 * then {rx,tx}_pause force the driver to use/not-use pause
 	 * flow control.
 	 */
-	u32	autoneg;
-	u32	rx_pause;
-	u32	tx_pause;
+	__u32	autoneg;
+	__u32	rx_pause;
+	__u32	tx_pause;
 };
 
 #define ETH_GSTRING_LEN		32
@@ -223,10 +223,10 @@
 
 /* for passing string sets for data tagging */
 struct ethtool_gstrings {
-	u32	cmd;		/* ETHTOOL_GSTRINGS */
-	u32	string_set;	/* string set id e.c. ETH_SS_TEST, etc*/
-	u32	len;		/* number of strings in the string set */
-	u8	data[0];
+	__u32	cmd;		/* ETHTOOL_GSTRINGS */
+	__u32	string_set;	/* string set id e.c. ETH_SS_TEST, etc*/
+	__u32	len;		/* number of strings in the string set */
+	__u8	data[0];
 };
 
 enum ethtool_test_flags {
@@ -236,30 +236,30 @@
 
 /* for requesting NIC test and getting results*/
 struct ethtool_test {
-	u32	cmd;		/* ETHTOOL_TEST */
-	u32	flags;		/* ETH_TEST_FL_xxx */
-	u32	reserved;
-	u32	len;		/* result length, in number of u64 elements */
-	u64	data[0];
+	__u32	cmd;		/* ETHTOOL_TEST */
+	__u32	flags;		/* ETH_TEST_FL_xxx */
+	__u32	reserved;
+	__u32	len;		/* result length, in number of __u64 elements */
+	__u64	data[0];
 };
 
 /* for dumping NIC-specific statistics */
 struct ethtool_stats {
-	u32	cmd;		/* ETHTOOL_GSTATS */
-	u32	n_stats;	/* number of u64's being returned */
-	u64	data[0];
+	__u32	cmd;		/* ETHTOOL_GSTATS */
+	__u32	n_stats;	/* number of __u64's being returned */
+	__u64	data[0];
 };
 
 struct net_device;
 
 /* Some generic methods drivers may use in their ethtool_ops */
-u32 ethtool_op_get_link(struct net_device *dev);
-u32 ethtool_op_get_tx_csum(struct net_device *dev);
-int ethtool_op_set_tx_csum(struct net_device *dev, u32 data);
-u32 ethtool_op_get_sg(struct net_device *dev);
-int ethtool_op_set_sg(struct net_device *dev, u32 data);
-u32 ethtool_op_get_tso(struct net_device *dev);
-int ethtool_op_set_tso(struct net_device *dev, u32 data);
+__u32 ethtool_op_get_link(struct net_device *dev);
+__u32 ethtool_op_get_tx_csum(struct net_device *dev);
+int ethtool_op_set_tx_csum(struct net_device *dev, __u32 data);
+__u32 ethtool_op_get_sg(struct net_device *dev);
+int ethtool_op_set_sg(struct net_device *dev, __u32 data);
+__u32 ethtool_op_get_tso(struct net_device *dev);
+int ethtool_op_set_tso(struct net_device *dev, __u32 data);
 
 /**
  * &ethtool_ops - Alter and report network device settings
@@ -324,33 +324,33 @@
 	void	(*get_regs)(struct net_device *, struct ethtool_regs *, void *);
 	void	(*get_wol)(struct net_device *, struct ethtool_wolinfo *);
 	int	(*set_wol)(struct net_device *, struct ethtool_wolinfo *);
-	u32	(*get_msglevel)(struct net_device *);
-	void	(*set_msglevel)(struct net_device *, u32);
+	__u32	(*get_msglevel)(struct net_device *);
+	void	(*set_msglevel)(struct net_device *, __u32);
 	int	(*nway_reset)(struct net_device *);
-	u32	(*get_link)(struct net_device *);
+	__u32	(*get_link)(struct net_device *);
 	int	(*get_eeprom_len)(struct net_device *);
-	int	(*get_eeprom)(struct net_device *, struct ethtool_eeprom *, u8 *);
-	int	(*set_eeprom)(struct net_device *, struct ethtool_eeprom *, u8 *);
+	int	(*get_eeprom)(struct net_device *, struct ethtool_eeprom *, __u8 *);
+	int	(*set_eeprom)(struct net_device *, struct ethtool_eeprom *, __u8 *);
 	int	(*get_coalesce)(struct net_device *, struct ethtool_coalesce *);
 	int	(*set_coalesce)(struct net_device *, struct ethtool_coalesce *);
 	void	(*get_ringparam)(struct net_device *, struct ethtool_ringparam *);
 	int	(*set_ringparam)(struct net_device *, struct ethtool_ringparam *);
 	void	(*get_pauseparam)(struct net_device *, struct ethtool_pauseparam*);
 	int	(*set_pauseparam)(struct net_device *, struct ethtool_pauseparam*);
-	u32	(*get_rx_csum)(struct net_device *);
-	int	(*set_rx_csum)(struct net_device *, u32);
-	u32	(*get_tx_csum)(struct net_device *);
-	int	(*set_tx_csum)(struct net_device *, u32);
-	u32	(*get_sg)(struct net_device *);
-	int	(*set_sg)(struct net_device *, u32);
-	u32	(*get_tso)(struct net_device *);
-	int	(*set_tso)(struct net_device *, u32);
+	__u32	(*get_rx_csum)(struct net_device *);
+	int	(*set_rx_csum)(struct net_device *, __u32);
+	__u32	(*get_tx_csum)(struct net_device *);
+	int	(*set_tx_csum)(struct net_device *, __u32);
+	__u32	(*get_sg)(struct net_device *);
+	int	(*set_sg)(struct net_device *, __u32);
+	__u32	(*get_tso)(struct net_device *);
+	int	(*set_tso)(struct net_device *, __u32);
 	int	(*self_test_count)(struct net_device *);
-	void	(*self_test)(struct net_device *, struct ethtool_test *, u64 *);
-	void	(*get_strings)(struct net_device *, u32 stringset, u8 *);
-	int	(*phys_id)(struct net_device *, u32);
+	void	(*self_test)(struct net_device *, struct ethtool_test *, __u64 *);
+	void	(*get_strings)(struct net_device *, __u32 stringset, __u8 *);
+	int	(*phys_id)(struct net_device *, __u32);
 	int	(*get_stats_count)(struct net_device *);
-	void	(*get_ethtool_stats)(struct net_device *, struct ethtool_stats *, u64 *);
+	void	(*get_ethtool_stats)(struct net_device *, struct ethtool_stats *, __u64 *);
 	int	(*begin)(struct net_device *);
 	void	(*complete)(struct net_device *);
 };
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/firmware.h linux-libc-headers-2.6.8.0/include/linux/firmware.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/firmware.h	2003-12-15 12:46:58.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/firmware.h	2004-08-26 05:42:08.000000000 -0500
@@ -5,7 +5,7 @@
 #define FIRMWARE_NAME_MAX 30 
 struct firmware {
 	size_t size;
-	u8 *data;
+	__u8 *data;
 };
 int request_firmware(const struct firmware **fw, const char *name,
 		     struct device *device);
@@ -15,5 +15,5 @@
 	void (*cont)(const struct firmware *fw, void *context));
 
 void release_firmware(const struct firmware *fw);
-void register_firmware(const char *name, const u8 *data, size_t size);
+void register_firmware(const char *name, const __u8 *data, size_t size);
 #endif
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/fs.h linux-libc-headers-2.6.8.0/include/linux/fs.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/fs.h	2004-08-18 13:16:02.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/fs.h	2004-08-26 05:42:08.000000000 -0500
@@ -198,7 +198,7 @@
 /* A jump here: 108-111 have been used for various private purposes. */
 #define BLKBSZGET  _IOR(0x12,112,size_t)
 #define BLKBSZSET  _IOW(0x12,113,size_t)
-#define BLKGETSIZE64 _IOR(0x12,114,size_t)	/* return device size in bytes (u64 *arg) */
+#define BLKGETSIZE64 _IOR(0x12,114,size_t)	/* return device size in bytes (__u64 *arg) */
 
 #define BMAP_IOCTL 1		/* obsolete - kept for compatibility */
 #define FIBMAP	   _IO(0x00,1)	/* bmap access */
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/i2c.h linux-libc-headers-2.6.8.0/include/linux/i2c.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/i2c.h	2004-06-23 16:52:54.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/i2c.h	2004-08-26 05:42:08.000000000 -0500
@@ -70,36 +70,36 @@
    and probably just as fast. 
    Note that we use i2c_adapter here, because you do not need a specific
    smbus adapter to call this function. */
-extern s32 i2c_smbus_xfer (struct i2c_adapter * adapter, u16 addr, 
+extern __s32 i2c_smbus_xfer (struct i2c_adapter * adapter, __u16 addr, 
                            unsigned short flags,
-                           char read_write, u8 command, int size,
+                           char read_write, __u8 command, int size,
                            union i2c_smbus_data * data);
 
 /* Now follow the 'nice' access routines. These also document the calling
    conventions of smbus_access. */
 
-extern s32 i2c_smbus_write_quick(struct i2c_client * client, u8 value);
-extern s32 i2c_smbus_read_byte(struct i2c_client * client);
-extern s32 i2c_smbus_write_byte(struct i2c_client * client, u8 value);
-extern s32 i2c_smbus_read_byte_data(struct i2c_client * client, u8 command);
-extern s32 i2c_smbus_write_byte_data(struct i2c_client * client,
-                                     u8 command, u8 value);
-extern s32 i2c_smbus_read_word_data(struct i2c_client * client, u8 command);
-extern s32 i2c_smbus_write_word_data(struct i2c_client * client,
-                                     u8 command, u16 value);
-extern s32 i2c_smbus_process_call(struct i2c_client * client,
-                                  u8 command, u16 value);
+extern __s32 i2c_smbus_write_quick(struct i2c_client * client, __u8 value);
+extern __s32 i2c_smbus_read_byte(struct i2c_client * client);
+extern __s32 i2c_smbus_write_byte(struct i2c_client * client, __u8 value);
+extern __s32 i2c_smbus_read_byte_data(struct i2c_client * client, __u8 command);
+extern __s32 i2c_smbus_write_byte_data(struct i2c_client * client,
+                                     __u8 command, __u8 value);
+extern __s32 i2c_smbus_read_word_data(struct i2c_client * client, __u8 command);
+extern __s32 i2c_smbus_write_word_data(struct i2c_client * client,
+                                     __u8 command, __u16 value);
+extern __s32 i2c_smbus_process_call(struct i2c_client * client,
+                                  __u8 command, __u16 value);
 /* Returns the number of read bytes */
-extern s32 i2c_smbus_read_block_data(struct i2c_client * client,
-                                     u8 command, u8 *values);
-extern s32 i2c_smbus_write_block_data(struct i2c_client * client,
-                                      u8 command, u8 length,
-                                      u8 *values);
-extern s32 i2c_smbus_read_i2c_block_data(struct i2c_client * client,
-                                         u8 command, u8 *values);
-extern s32 i2c_smbus_write_i2c_block_data(struct i2c_client * client,
-                                          u8 command, u8 length,
-                                          u8 *values);
+extern __s32 i2c_smbus_read_block_data(struct i2c_client * client,
+                                     __u8 command, __u8 *values);
+extern __s32 i2c_smbus_write_block_data(struct i2c_client * client,
+                                      __u8 command, __u8 length,
+                                      __u8 *values);
+extern __s32 i2c_smbus_read_i2c_block_data(struct i2c_client * client,
+                                         __u8 command, __u8 *values);
+extern __s32 i2c_smbus_write_i2c_block_data(struct i2c_client * client,
+                                          __u8 command, __u8 length,
+                                          __u8 *values);
 
 
 /*
@@ -203,9 +203,9 @@
 	   using common I2C messages */
 	int (*master_xfer)(struct i2c_adapter *adap,struct i2c_msg msgs[], 
 	                   int num);
-	int (*smbus_xfer) (struct i2c_adapter *adap, u16 addr, 
+	int (*smbus_xfer) (struct i2c_adapter *adap, __u16 addr, 
 	                   unsigned short flags, char read_write,
-	                   u8 command, int size, union i2c_smbus_data * data);
+	                   __u8 command, int size, union i2c_smbus_data * data);
 
 	/* --- these optional/future use for some adapter types.*/
 	int (*slave_send)(struct i2c_adapter *,char*,int);
@@ -215,7 +215,7 @@
 	int (*algo_control)(struct i2c_adapter *, unsigned int, unsigned long);
 
 	/* To determine what the adapter supports */
-	u32 (*functionality) (struct i2c_adapter *);
+	__u32 (*functionality) (struct i2c_adapter *);
 };
 
 /*
@@ -381,10 +381,10 @@
 
 
 /* Return the functionality mask */
-extern u32 i2c_get_functionality (struct i2c_adapter *adap);
+extern __u32 i2c_get_functionality (struct i2c_adapter *adap);
 
 /* Return 1 if adapter supports everything we need, 0 if not. */
-extern int i2c_check_functionality (struct i2c_adapter *adap, u32 func);
+extern int i2c_check_functionality (struct i2c_adapter *adap, __u32 func);
 
 /*
  * I2C Message - used for pure i2c transaction, also from /dev interface
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/i2o-dev.h linux-libc-headers-2.6.8.0/include/linux/i2o-dev.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/i2o-dev.h	2004-06-23 16:52:54.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/i2o-dev.h	2004-08-26 05:42:08.000000000 -0500
@@ -29,7 +29,7 @@
  * I2O Control IOCTLs and structures
  */
 #define I2O_MAGIC_NUMBER	'i'
-#define I2OGETIOPS		_IOR(I2O_MAGIC_NUMBER,0,u8[MAX_I2O_CONTROLLERS])
+#define I2OGETIOPS		_IOR(I2O_MAGIC_NUMBER,0,__u8[MAX_I2O_CONTROLLERS])
 #define I2OHRTGET		_IOWR(I2O_MAGIC_NUMBER,1,struct i2o_cmd_hrtlct)
 #define I2OLCTGET		_IOWR(I2O_MAGIC_NUMBER,2,struct i2o_cmd_hrtlct)
 #define I2OPARMSET		_IOWR(I2O_MAGIC_NUMBER,3,struct i2o_cmd_psetget)
@@ -37,7 +37,7 @@
 #define I2OSWDL 		_IOWR(I2O_MAGIC_NUMBER,5,struct i2o_sw_xfer)
 #define I2OSWUL 		_IOWR(I2O_MAGIC_NUMBER,6,struct i2o_sw_xfer)
 #define I2OSWDEL		_IOWR(I2O_MAGIC_NUMBER,7,struct i2o_sw_xfer)
-#define I2OVALIDATE		_IOR(I2O_MAGIC_NUMBER,8,u32)
+#define I2OVALIDATE		_IOR(I2O_MAGIC_NUMBER,8,__u32)
 #define I2OHTML 		_IOWR(I2O_MAGIC_NUMBER,9,struct i2o_html)
 #define I2OEVTREG		_IOW(I2O_MAGIC_NUMBER,10,struct i2o_evt_id)
 #define I2OEVTGET		_IOR(I2O_MAGIC_NUMBER,11,struct i2o_evt_info)
@@ -129,65 +129,65 @@
 #define I2O_BUS_CARDBUS 7
 #define I2O_BUS_UNKNOWN 0x80
 
-typedef unsigned char u8;
-typedef unsigned short u16;
-typedef unsigned int u32;
+typedef unsigned char __u8;
+typedef unsigned short __u16;
+typedef unsigned int __u32;
 
 typedef struct _i2o_pci_bus
 {
-	u8	PciFunctionNumber;
-	u8	PciDeviceNumber;
-	u8	PciBusNumber;
-	u8	reserved;
-	u16	PciVendorID;
-	u16	PciDeviceID;
+	__u8	PciFunctionNumber;
+	__u8	PciDeviceNumber;
+	__u8	PciBusNumber;
+	__u8	reserved;
+	__u16	PciVendorID;
+	__u16	PciDeviceID;
 } i2o_pci_bus;
 
 typedef struct _i2o_local_bus
 {
-	u16	LbBaseIOPort;
-	u16	reserved;
-	u32	LbBaseMemoryAddress;
+	__u16	LbBaseIOPort;
+	__u16	reserved;
+	__u32	LbBaseMemoryAddress;
 } i2o_local_bus;
 
 typedef struct _i2o_isa_bus
 {
-	u16	IsaBaseIOPort;
-	u8	CSN;
-	u8	reserved;
-	u32	IsaBaseMemoryAddress;
+	__u16	IsaBaseIOPort;
+	__u8	CSN;
+	__u8	reserved;
+	__u32	IsaBaseMemoryAddress;
 } i2o_isa_bus;
 
 typedef struct _i2o_eisa_bus_info
 {
-	u16	EisaBaseIOPort;
-	u8	reserved;
-	u8	EisaSlotNumber;
-	u32	EisaBaseMemoryAddress;
+	__u16	EisaBaseIOPort;
+	__u8	reserved;
+	__u8	EisaSlotNumber;
+	__u32	EisaBaseMemoryAddress;
 } i2o_eisa_bus;
 
 typedef struct _i2o_mca_bus
 {
-	u16	McaBaseIOPort;
-	u8	reserved;
-	u8	McaSlotNumber;
-	u32	McaBaseMemoryAddress;
+	__u16	McaBaseIOPort;
+	__u8	reserved;
+	__u8	McaSlotNumber;
+	__u32	McaBaseMemoryAddress;
 } i2o_mca_bus;
 
 typedef struct _i2o_other_bus
 {
-	u16 BaseIOPort;
-	u16 reserved;
-	u32 BaseMemoryAddress;
+	__u16 BaseIOPort;
+	__u16 reserved;
+	__u32 BaseMemoryAddress;
 } i2o_other_bus;
 
 typedef struct _i2o_hrt_entry
 {
-	u32	adapter_id;
-	u32	parent_tid:12;
-	u32 	state:4;
-	u32	bus_num:8;
-	u32	bus_type:8;
+	__u32	adapter_id;
+	__u32	parent_tid:12;
+	__u32 	state:4;
+	__u32	bus_num:8;
+	__u32	bus_type:8;
 	union
 	{
 		i2o_pci_bus	pci_bus;
@@ -201,69 +201,69 @@
 
 typedef struct _i2o_hrt
 {
-	u16	num_entries;
-	u8	entry_len;
-	u8	hrt_version;
-	u32	change_ind;
+	__u16	num_entries;
+	__u8	entry_len;
+	__u8	hrt_version;
+	__u32	change_ind;
 	i2o_hrt_entry hrt_entry[1];
 } i2o_hrt;
 
 typedef struct _i2o_lct_entry
 {
-	u32	entry_size:16;
-	u32	tid:12;
-	u32	reserved:4;
-	u32	change_ind;
-	u32	device_flags;
-	u32	class_id:12;
-	u32	version:4;
-	u32	vendor_id:16;
-	u32	sub_class;
-	u32	user_tid:12;
-	u32	parent_tid:12;
-	u32	bios_info:8;
-	u8	identity_tag[8];
-	u32	event_capabilities;
+	__u32	entry_size:16;
+	__u32	tid:12;
+	__u32	reserved:4;
+	__u32	change_ind;
+	__u32	device_flags;
+	__u32	class_id:12;
+	__u32	version:4;
+	__u32	vendor_id:16;
+	__u32	sub_class;
+	__u32	user_tid:12;
+	__u32	parent_tid:12;
+	__u32	bios_info:8;
+	__u8	identity_tag[8];
+	__u32	event_capabilities;
 } i2o_lct_entry;
 
 typedef struct _i2o_lct
 {
-	u32	table_size:16;
-	u32	boot_tid:12;
-	u32	lct_ver:4;
-	u32	iop_flags;
-	u32	change_ind;
+	__u32	table_size:16;
+	__u32	boot_tid:12;
+	__u32	lct_ver:4;
+	__u32	iop_flags;
+	__u32	change_ind;
 	i2o_lct_entry lct_entry[1];
 } i2o_lct;
 
 typedef struct _i2o_status_block
 {
-	u16	org_id;
-	u16	reserved;
-	u16	iop_id:12;
-	u16	reserved1:4;
-	u16	host_unit_id;
-	u16	segment_number:12;
-	u16	i2o_version:4;
-	u8	iop_state;
-	u8	msg_type;
-	u16	inbound_frame_size;
-	u8	init_code;
-	u8	reserved2;
-	u32	max_inbound_frames;
-	u32	cur_inbound_frames;
-	u32	max_outbound_frames;
+	__u16	org_id;
+	__u16	reserved;
+	__u16	iop_id:12;
+	__u16	reserved1:4;
+	__u16	host_unit_id;
+	__u16	segment_number:12;
+	__u16	i2o_version:4;
+	__u8	iop_state;
+	__u8	msg_type;
+	__u16	inbound_frame_size;
+	__u8	init_code;
+	__u8	reserved2;
+	__u32	max_inbound_frames;
+	__u32	cur_inbound_frames;
+	__u32	max_outbound_frames;
 	char	product_id[24];
-	u32	expected_lct_size;
-	u32	iop_capabilities;
-	u32	desired_mem_size;
-	u32	current_mem_size;
-	u32	current_mem_base;
-	u32	desired_io_size;
-	u32	current_io_size;
-	u32	current_io_base;
-	u32	reserved3:24;
-	u32	cmd_status:8;
+	__u32	expected_lct_size;
+	__u32	iop_capabilities;
+	__u32	desired_mem_size;
+	__u32	current_mem_size;
+	__u32	current_mem_base;
+	__u32	desired_io_size;
+	__u32	current_io_size;
+	__u32	current_io_base;
+	__u32	reserved3:24;
+	__u32	cmd_status:8;
 } i2o_status_block;
 
 /* Event indicator mask flags */
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/isdn/capilli.h linux-libc-headers-2.6.8.0/include/linux/isdn/capilli.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/isdn/capilli.h	2004-03-28 07:52:12.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/isdn/capilli.h	2004-08-26 13:26:47.000000000 -0500
@@ -43,20 +43,20 @@
 	char *driver_name;			/* name of driver */
 	int (*load_firmware)(struct capi_ctr *, capiloaddata *);
 	void (*reset_ctr)(struct capi_ctr *);
-	void (*register_appl)(struct capi_ctr *, u16 appl,
+	void (*register_appl)(struct capi_ctr *, __u16 appl,
 			      capi_register_params *);
-	void (*release_appl)(struct capi_ctr *, u16 appl);
-	u16  (*send_message)(struct capi_ctr *, struct sk_buff *skb);
+	void (*release_appl)(struct capi_ctr *, __u16 appl);
+	__u16  (*send_message)(struct capi_ctr *, struct sk_buff *skb);
 	
 	char *(*procinfo)(struct capi_ctr *);
 	int (*ctr_read_proc)(char *page, char **start, off_t off,
 			     int count, int *eof, struct capi_ctr *card);
 
 	/* filled in before calling ready callback */
-	u8 manu[CAPI_MANUFACTURER_LEN];		/* CAPI_GET_MANUFACTURER */
+	__u8 manu[CAPI_MANUFACTURER_LEN];		/* CAPI_GET_MANUFACTURER */
 	capi_version version;			/* CAPI_GET_VERSION */
 	capi_profile profile;			/* CAPI_GET_PROFILE */
-	u8 serial[CAPI_SERIAL_LEN];		/* CAPI_GET_SERIAL */
+	__u8 serial[CAPI_SERIAL_LEN];		/* CAPI_GET_SERIAL */
 
 	/* management information for kcapi */
 
@@ -81,7 +81,7 @@
 void capi_ctr_reseted(struct capi_ctr * card);
 void capi_ctr_suspend_output(struct capi_ctr * card);
 void capi_ctr_resume_output(struct capi_ctr * card);
-void capi_ctr_handle_message(struct capi_ctr * card, u16 appl, struct sk_buff *skb);
+void capi_ctr_handle_message(struct capi_ctr * card, __u16 appl, struct sk_buff *skb);
 
 // ---------------------------------------------------------------------------
 // needed for AVM capi drivers
@@ -102,11 +102,11 @@
 // ---------------------------------------------------------------------------
 // library functions for use by hardware controller drivers
 
-void capilib_new_ncci(struct list_head *head, u16 applid, u32 ncci, u32 winsize);
-void capilib_free_ncci(struct list_head *head, u16 applid, u32 ncci);
-void capilib_release_appl(struct list_head *head, u16 applid);
+void capilib_new_ncci(struct list_head *head, __u16 applid, __u32 ncci, __u32 winsize);
+void capilib_free_ncci(struct list_head *head, __u16 applid, __u32 ncci);
+void capilib_release_appl(struct list_head *head, __u16 applid);
 void capilib_release(struct list_head *head);
-void capilib_data_b3_conf(struct list_head *head, u16 applid, u32 ncci, u16 msgid);
-u16  capilib_data_b3_req(struct list_head *head, u16 applid, u32 ncci, u16 msgid);
+void capilib_data_b3_conf(struct list_head *head, __u16 applid, __u32 ncci, __u16 msgid);
+__u16  capilib_data_b3_req(struct list_head *head, __u16 applid, __u32 ncci, __u16 msgid);
 
 #endif				/* __CAPILLI_H__ */
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/jhash.h linux-libc-headers-2.6.8.0/include/linux/jhash.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/jhash.h	2004-03-28 07:52:09.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/jhash.h	2004-08-26 05:42:08.000000000 -0500
@@ -41,19 +41,19 @@
  * of bytes.  No alignment or length assumptions are made about
  * the input key.
  */
-static inline u32 jhash(const void *key, u32 length, u32 initval)
+static inline __u32 jhash(const void *key, __u32 length, __u32 initval)
 {
-	u32 a, b, c, len;
-	const u8 *k = key;
+	__u32 a, b, c, len;
+	const __u8 *k = key;
 
 	len = length;
 	a = b = JHASH_GOLDEN_RATIO;
 	c = initval;
 
 	while (len >= 12) {
-		a += (k[0] +((u32)k[1]<<8) +((u32)k[2]<<16) +((u32)k[3]<<24));
-		b += (k[4] +((u32)k[5]<<8) +((u32)k[6]<<16) +((u32)k[7]<<24));
-		c += (k[8] +((u32)k[9]<<8) +((u32)k[10]<<16)+((u32)k[11]<<24));
+		a += (k[0] +((__u32)k[1]<<8) +((__u32)k[2]<<16) +((__u32)k[3]<<24));
+		b += (k[4] +((__u32)k[5]<<8) +((__u32)k[6]<<16) +((__u32)k[7]<<24));
+		c += (k[8] +((__u32)k[9]<<8) +((__u32)k[10]<<16)+((__u32)k[11]<<24));
 
 		__jhash_mix(a,b,c);
 
@@ -63,16 +63,16 @@
 
 	c += length;
 	switch (len) {
-	case 11: c += ((u32)k[10]<<24);
-	case 10: c += ((u32)k[9]<<16);
-	case 9 : c += ((u32)k[8]<<8);
-	case 8 : b += ((u32)k[7]<<24);
-	case 7 : b += ((u32)k[6]<<16);
-	case 6 : b += ((u32)k[5]<<8);
+	case 11: c += ((__u32)k[10]<<24);
+	case 10: c += ((__u32)k[9]<<16);
+	case 9 : c += ((__u32)k[8]<<8);
+	case 8 : b += ((__u32)k[7]<<24);
+	case 7 : b += ((__u32)k[6]<<16);
+	case 6 : b += ((__u32)k[5]<<8);
 	case 5 : b += k[4];
-	case 4 : a += ((u32)k[3]<<24);
-	case 3 : a += ((u32)k[2]<<16);
-	case 2 : a += ((u32)k[1]<<8);
+	case 4 : a += ((__u32)k[3]<<24);
+	case 3 : a += ((__u32)k[2]<<16);
+	case 2 : a += ((__u32)k[1]<<8);
 	case 1 : a += k[0];
 	};
 
@@ -81,12 +81,12 @@
 	return c;
 }
 
-/* A special optimized version that handles 1 or more of u32s.
- * The length parameter here is the number of u32s in the key.
+/* A special optimized version that handles 1 or more of __u32s.
+ * The length parameter here is the number of __u32s in the key.
  */
-static inline u32 jhash2(u32 *k, u32 length, u32 initval)
+static inline __u32 jhash2(__u32 *k, __u32 length, __u32 initval)
 {
-	u32 a, b, c, len;
+	__u32 a, b, c, len;
 
 	a = b = JHASH_GOLDEN_RATIO;
 	c = initval;
@@ -119,7 +119,7 @@
  * NOTE: In partilar the "c += length; __jhash_mix(a,b,c);" normally
  *       done at the end is not done here.
  */
-static inline u32 jhash_3words(u32 a, u32 b, u32 c, u32 initval)
+static inline __u32 jhash_3words(__u32 a, __u32 b, __u32 c, __u32 initval)
 {
 	a += JHASH_GOLDEN_RATIO;
 	b += JHASH_GOLDEN_RATIO;
@@ -130,12 +130,12 @@
 	return c;
 }
 
-static inline u32 jhash_2words(u32 a, u32 b, u32 initval)
+static inline __u32 jhash_2words(__u32 a, __u32 b, __u32 initval)
 {
 	return jhash_3words(a, b, 0, initval);
 }
 
-static inline u32 jhash_1word(u32 a, u32 initval)
+static inline __u32 jhash_1word(__u32 a, __u32 initval)
 {
 	return jhash_3words(a, 0, 0, initval);
 }
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/jiffies.h linux-libc-headers-2.6.8.0/include/linux/jiffies.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/jiffies.h	2004-01-17 17:04:30.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/jiffies.h	2004-08-26 13:26:33.000000000 -0500
@@ -12,15 +12,15 @@
  * without sampling the sequence number in xtime_lock.
  * get_jiffies_64() will do this for you as appropriate.
  */
-extern u64 jiffies_64;
+extern __u64 jiffies_64;
 extern unsigned long volatile jiffies;
 
 #if (BITS_PER_LONG < 64)
-u64 get_jiffies_64(void);
+__u64 get_jiffies_64(void);
 #else
-static inline u64 get_jiffies_64(void)
+static inline __u64 get_jiffies_64(void)
 {
-	return (u64)jiffies;
+	return (__u64)jiffies;
 }
 #endif
 
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/kernel_stat.h linux-libc-headers-2.6.8.0/include/linux/kernel_stat.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/kernel_stat.h	2004-04-19 16:13:51.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/kernel_stat.h	2004-08-26 05:42:08.000000000 -0500
@@ -12,13 +12,13 @@
  */
 
 struct cpu_usage_stat {
-	u64 user;
-	u64 nice;
-	u64 system;
-	u64 softirq;
-	u64 irq;
-	u64 idle;
-	u64 iowait;
+	__u64 user;
+	__u64 nice;
+	__u64 system;
+	__u64 softirq;
+	__u64 irq;
+	__u64 idle;
+	__u64 iowait;
 };
 
 struct kernel_stat {
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/libata.h linux-libc-headers-2.6.8.0/include/linux/libata.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/libata.h	2004-08-18 13:16:03.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/libata.h	2004-08-26 05:42:08.000000000 -0500
@@ -160,7 +160,7 @@
 struct ata_queued_cmd;
 
 /* typedefs */
-typedef int (*ata_qc_cb_t) (struct ata_queued_cmd *qc, u8 drv_stat);
+typedef int (*ata_qc_cb_t) (struct ata_queued_cmd *qc, __u8 drv_stat);
 
 struct ata_ioports {
 	unsigned long		cmd_addr;
@@ -246,18 +246,18 @@
 };
 
 struct ata_device {
-	u64			n_sectors;	/* size of device, if ATA */
+	__u64			n_sectors;	/* size of device, if ATA */
 	unsigned long		flags;		/* ATA_DFLAG_xxx */
 	unsigned int		class;		/* ATA_DEV_xxx */
 	unsigned int		devno;		/* 0 or 1 */
-	u16			id[ATA_ID_WORDS]; /* IDENTIFY xxx DEVICE data */
+	__u16			id[ATA_ID_WORDS]; /* IDENTIFY xxx DEVICE data */
 	unsigned int		pio_mode;
 	unsigned int		udma_mode;
 
 	/* cache info about current transfer mode */
-	u8			xfer_protocol;	/* taskfile xfer protocol */
-	u8			read_cmd;	/* opcode to use on read */
-	u8			write_cmd;	/* opcode to use on write */
+	__u8			xfer_protocol;	/* taskfile xfer protocol */
+	__u8			read_cmd;	/* opcode to use on read */
+	__u8			write_cmd;	/* opcode to use on write */
 };
 
 struct ata_port {
@@ -272,8 +272,8 @@
 
 	struct ata_ioports	ioaddr;	/* ATA cmd/ctl/dma register blocks */
 
-	u8			ctl;	/* cache of ATA control register */
-	u8			last_ctl;	/* Cache last written value */
+	__u8			ctl;	/* cache of ATA control register */
+	__u8			last_ctl;	/* Cache last written value */
 	unsigned int		bus_state;
 	unsigned int		port_state;
 	unsigned int		pio_mask;
@@ -312,7 +312,7 @@
 	void (*tf_read) (struct ata_port *ap, struct ata_taskfile *tf);
 
 	void (*exec_command)(struct ata_port *ap, struct ata_taskfile *tf);
-	u8   (*check_status)(struct ata_port *ap);
+	__u8   (*check_status)(struct ata_port *ap);
 
 	void (*phy_reset) (struct ata_port *ap);
 	void (*post_set_mode) (struct ata_port *ap);
@@ -328,9 +328,9 @@
 	irqreturn_t (*irq_handler)(int, void *, struct pt_regs *);
 	void (*irq_clear) (struct ata_port *);
 
-	u32 (*scr_read) (struct ata_port *ap, unsigned int sc_reg);
+	__u32 (*scr_read) (struct ata_port *ap, unsigned int sc_reg);
 	void (*scr_write) (struct ata_port *ap, unsigned int sc_reg,
-			   u32 val);
+			   __u32 val);
 
 	int (*port_start) (struct ata_port *ap);
 	void (*port_stop) (struct ata_port *ap);
@@ -374,10 +374,10 @@
 extern void ata_tf_load_mmio(struct ata_port *ap, struct ata_taskfile *tf);
 extern void ata_tf_read_pio(struct ata_port *ap, struct ata_taskfile *tf);
 extern void ata_tf_read_mmio(struct ata_port *ap, struct ata_taskfile *tf);
-extern void ata_tf_to_fis(struct ata_taskfile *tf, u8 *fis, u8 pmp);
-extern void ata_tf_from_fis(u8 *fis, struct ata_taskfile *tf);
-extern u8 ata_check_status_pio(struct ata_port *ap);
-extern u8 ata_check_status_mmio(struct ata_port *ap);
+extern void ata_tf_to_fis(struct ata_taskfile *tf, __u8 *fis, __u8 pmp);
+extern void ata_tf_from_fis(__u8 *fis, struct ata_taskfile *tf);
+extern __u8 ata_check_status_pio(struct ata_port *ap);
+extern __u8 ata_check_status_mmio(struct ata_port *ap);
 extern void ata_exec_command_pio(struct ata_port *ap, struct ata_taskfile *tf);
 extern void ata_exec_command_mmio(struct ata_port *ap, struct ata_taskfile *tf);
 extern int ata_port_start (struct ata_port *ap);
@@ -397,7 +397,7 @@
 extern void ata_bmdma_start_pio (struct ata_queued_cmd *qc);
 extern void ata_bmdma_irq_clear(struct ata_port *ap);
 extern int pci_test_config_bits(struct pci_dev *pdev, struct pci_bits *bits);
-extern void ata_qc_complete(struct ata_queued_cmd *qc, u8 drv_stat);
+extern void ata_qc_complete(struct ata_queued_cmd *qc, __u8 drv_stat);
 extern void ata_eng_timeout(struct ata_port *ap);
 extern int ata_std_bios_param(struct scsi_device *sdev,
 			      struct block_device *bdev,
@@ -416,7 +416,7 @@
 		(dev->class == ATA_DEV_ATAPI));
 }
 
-static inline u8 ata_chk_err(struct ata_port *ap)
+static inline __u8 ata_chk_err(struct ata_port *ap)
 {
 	if (ap->flags & ATA_FLAG_MMIO) {
 		return readb((void *) ap->ioaddr.error_addr);
@@ -424,12 +424,12 @@
 	return inb(ap->ioaddr.error_addr);
 }
 
-static inline u8 ata_chk_status(struct ata_port *ap)
+static inline __u8 ata_chk_status(struct ata_port *ap)
 {
 	return ap->ops->check_status(ap);
 }
 
-static inline u8 ata_altstatus(struct ata_port *ap)
+static inline __u8 ata_altstatus(struct ata_port *ap)
 {
 	if (ap->flags & ATA_FLAG_MMIO)
 		return readb(ap->ioaddr.altstatus_addr);
@@ -442,10 +442,10 @@
 	ndelay(400);
 }
 
-static inline u8 ata_busy_wait(struct ata_port *ap, unsigned int bits,
+static inline __u8 ata_busy_wait(struct ata_port *ap, unsigned int bits,
 			       unsigned int max)
 {
-	u8 status;
+	__u8 status;
 
 	do {
 		udelay(10);
@@ -456,9 +456,9 @@
 	return status;
 }
 
-static inline u8 ata_wait_idle(struct ata_port *ap)
+static inline __u8 ata_wait_idle(struct ata_port *ap)
 {
-	u8 status = ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 1000);
+	__u8 status = ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 1000);
 
 	if (status & (ATA_BUSY | ATA_DRQ)) {
 		unsigned long l = ap->ioaddr.status_addr;
@@ -495,10 +495,10 @@
 		tf->device = ATA_DEVICE_OBS | ATA_DEV1;
 }
 
-static inline u8 ata_irq_on(struct ata_port *ap)
+static inline __u8 ata_irq_on(struct ata_port *ap)
 {
 	struct ata_ioports *ioaddr = &ap->ioaddr;
-	u8 tmp;
+	__u8 tmp;
 
 	ap->ctl &= ~ATA_NIEN;
 	ap->last_ctl = ap->ctl;
@@ -514,10 +514,10 @@
 	return tmp;
 }
 
-static inline u8 ata_irq_ack(struct ata_port *ap, unsigned int chk_drq)
+static inline __u8 ata_irq_ack(struct ata_port *ap, unsigned int chk_drq)
 {
 	unsigned int bits = chk_drq ? ATA_BUSY | ATA_DRQ : ATA_BUSY;
-	u8 host_stat, post_stat, status;
+	__u8 host_stat, post_stat, status;
 
 	status = ata_busy_wait(ap, bits, 1000);
 	if (status & bits)
@@ -545,12 +545,12 @@
 	return status;
 }
 
-static inline u32 scr_read(struct ata_port *ap, unsigned int reg)
+static inline __u32 scr_read(struct ata_port *ap, unsigned int reg)
 {
 	return ap->ops->scr_read(ap, reg);
 }
 
-static inline void scr_write(struct ata_port *ap, unsigned int reg, u32 val)
+static inline void scr_write(struct ata_port *ap, unsigned int reg, __u32 val)
 {
 	ap->ops->scr_write(ap, reg, val);
 }
@@ -589,9 +589,9 @@
 	}
 }
 
-static inline u8 ata_bmdma_status(struct ata_port *ap)
+static inline __u8 ata_bmdma_status(struct ata_port *ap)
 {
-	u8 host_stat;
+	__u8 host_stat;
 	if (ap->flags & ATA_FLAG_MMIO) {
 		void *mmio = (void *) ap->ioaddr.bmdma_addr;
 		host_stat = readb(mmio + ATA_DMA_STATUS);
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/lockd/bind.h linux-libc-headers-2.6.8.0/include/linux/lockd/bind.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/lockd/bind.h	2003-12-15 12:46:58.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/lockd/bind.h	2004-08-26 05:42:08.000000000 -0500
@@ -18,7 +18,7 @@
  * This is the set of functions for lockd->nfsd communication
  */
 struct nlmsvc_binding {
-	u32			(*fopen)(struct svc_rqst *,
+	__u32			(*fopen)(struct svc_rqst *,
 						struct nfs_fh *,
 						struct file *);
 	void			(*fclose)(struct file *);
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/lockd/nlm.h linux-libc-headers-2.6.8.0/include/linux/lockd/nlm.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/lockd/nlm.h	2004-01-17 17:04:34.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/lockd/nlm.h	2004-08-26 05:42:08.000000000 -0500
@@ -11,8 +11,8 @@
 
 
 /* Maximum file offset in file_lock.fl_end */
-# define NLM_OFFSET_MAX		((s32) 0x7fffffff)
-# define NLM4_OFFSET_MAX	((s64) ((~(u64)0) >> 1))
+# define NLM_OFFSET_MAX		((__s32) 0x7fffffff)
+# define NLM4_OFFSET_MAX	((__s64) ((~(__u64)0) >> 1))
 
 /* Return states for NLM */
 enum {
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/lockd/share.h linux-libc-headers-2.6.8.0/include/linux/lockd/share.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/lockd/share.h	2003-12-15 12:46:58.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/lockd/share.h	2004-08-26 13:26:43.000000000 -0500
@@ -17,13 +17,13 @@
 	struct nlm_host *	s_host;		/* client host */
 	struct nlm_file *	s_file;		/* shared file */
 	struct xdr_netobj	s_owner;	/* owner handle */
-	u32			s_access;	/* access mode */
-	u32			s_mode;		/* deny mode */
+	__u32			s_access;	/* access mode */
+	__u32			s_mode;		/* deny mode */
 };
 
-u32	nlmsvc_share_file(struct nlm_host *, struct nlm_file *,
+__u32	nlmsvc_share_file(struct nlm_host *, struct nlm_file *,
 					       struct nlm_args *);
-u32	nlmsvc_unshare_file(struct nlm_host *, struct nlm_file *,
+__u32	nlmsvc_unshare_file(struct nlm_host *, struct nlm_file *,
 					       struct nlm_args *);
 int	nlmsvc_traverse_shares(struct nlm_host *, struct nlm_file *, int);
 
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/lockd/sm_inter.h linux-libc-headers-2.6.8.0/include/linux/lockd/sm_inter.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/lockd/sm_inter.h	2003-12-15 12:46:58.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/lockd/sm_inter.h	2004-08-26 05:42:08.000000000 -0500
@@ -24,23 +24,23 @@
  * Arguments for all calls to statd
  */
 struct nsm_args {
-	u32		addr;		/* remote address */
-	u32		prog;		/* RPC callback info */
-	u32		vers;
-	u32		proc;
-	u32		proto;		/* protocol (udp/tcp) plus server/client flag */
+	__u32		addr;		/* remote address */
+	__u32		prog;		/* RPC callback info */
+	__u32		vers;
+	__u32		proc;
+	__u32		proto;		/* protocol (udp/tcp) plus server/client flag */
 };
 
 /*
  * Result returned by statd
  */
 struct nsm_res {
-	u32		status;
-	u32		state;
+	__u32		status;
+	__u32		state;
 };
 
 int		nsm_monitor(struct nlm_host *);
 int		nsm_unmonitor(struct nlm_host *);
-extern u32	nsm_local_state;
+extern __u32	nsm_local_state;
 
 #endif /* LINUX_LOCKD_SM_INTER_H */
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/lockd/xdr.h linux-libc-headers-2.6.8.0/include/linux/lockd/xdr.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/lockd/xdr.h	2004-01-05 12:42:33.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/lockd/xdr.h	2004-08-26 05:42:08.000000000 -0500
@@ -48,12 +48,12 @@
 struct nlm_args {
 	struct nlm_cookie	cookie;
 	struct nlm_lock		lock;
-	u32			block;
-	u32			reclaim;
-	u32			state;
-	u32			monitor;
-	u32			fsm_access;
-	u32			fsm_mode;
+	__u32			block;
+	__u32			reclaim;
+	__u32			state;
+	__u32			monitor;
+	__u32			fsm_access;
+	__u32			fsm_mode;
 };
 
 typedef struct nlm_args nlm_args;
@@ -63,7 +63,7 @@
  */
 struct nlm_res {
 	struct nlm_cookie	cookie;
-	u32			status;
+	__u32			status;
 	struct nlm_lock		lock;
 };
 
@@ -73,10 +73,10 @@
 struct nlm_reboot {
 	char *		mon;
 	int		len;
-	u32		state;
-	u32		addr;
-	u32		vers;
-	u32		proto;
+	__u32		state;
+	__u32		addr;
+	__u32		vers;
+	__u32		proto;
 };
 
 /*
@@ -84,24 +84,24 @@
  */
 #define NLMSVC_XDRSIZE		sizeof(struct nlm_args)
 
-int	nlmsvc_decode_testargs(struct svc_rqst *, u32 *, struct nlm_args *);
-int	nlmsvc_encode_testres(struct svc_rqst *, u32 *, struct nlm_res *);
-int	nlmsvc_decode_lockargs(struct svc_rqst *, u32 *, struct nlm_args *);
-int	nlmsvc_decode_cancargs(struct svc_rqst *, u32 *, struct nlm_args *);
-int	nlmsvc_decode_unlockargs(struct svc_rqst *, u32 *, struct nlm_args *);
-int	nlmsvc_encode_res(struct svc_rqst *, u32 *, struct nlm_res *);
-int	nlmsvc_decode_res(struct svc_rqst *, u32 *, struct nlm_res *);
-int	nlmsvc_encode_void(struct svc_rqst *, u32 *, void *);
-int	nlmsvc_decode_void(struct svc_rqst *, u32 *, void *);
-int	nlmsvc_decode_shareargs(struct svc_rqst *, u32 *, struct nlm_args *);
-int	nlmsvc_encode_shareres(struct svc_rqst *, u32 *, struct nlm_res *);
-int	nlmsvc_decode_notify(struct svc_rqst *, u32 *, struct nlm_args *);
-int	nlmsvc_decode_reboot(struct svc_rqst *, u32 *, struct nlm_reboot *);
+int	nlmsvc_decode_testargs(struct svc_rqst *, __u32 *, struct nlm_args *);
+int	nlmsvc_encode_testres(struct svc_rqst *, __u32 *, struct nlm_res *);
+int	nlmsvc_decode_lockargs(struct svc_rqst *, __u32 *, struct nlm_args *);
+int	nlmsvc_decode_cancargs(struct svc_rqst *, __u32 *, struct nlm_args *);
+int	nlmsvc_decode_unlockargs(struct svc_rqst *, __u32 *, struct nlm_args *);
+int	nlmsvc_encode_res(struct svc_rqst *, __u32 *, struct nlm_res *);
+int	nlmsvc_decode_res(struct svc_rqst *, __u32 *, struct nlm_res *);
+int	nlmsvc_encode_void(struct svc_rqst *, __u32 *, void *);
+int	nlmsvc_decode_void(struct svc_rqst *, __u32 *, void *);
+int	nlmsvc_decode_shareargs(struct svc_rqst *, __u32 *, struct nlm_args *);
+int	nlmsvc_encode_shareres(struct svc_rqst *, __u32 *, struct nlm_res *);
+int	nlmsvc_decode_notify(struct svc_rqst *, __u32 *, struct nlm_args *);
+int	nlmsvc_decode_reboot(struct svc_rqst *, __u32 *, struct nlm_reboot *);
 /*
-int	nlmclt_encode_testargs(struct rpc_rqst *, u32 *, struct nlm_args *);
-int	nlmclt_encode_lockargs(struct rpc_rqst *, u32 *, struct nlm_args *);
-int	nlmclt_encode_cancargs(struct rpc_rqst *, u32 *, struct nlm_args *);
-int	nlmclt_encode_unlockargs(struct rpc_rqst *, u32 *, struct nlm_args *);
+int	nlmclt_encode_testargs(struct rpc_rqst *, __u32 *, struct nlm_args *);
+int	nlmclt_encode_lockargs(struct rpc_rqst *, __u32 *, struct nlm_args *);
+int	nlmclt_encode_cancargs(struct rpc_rqst *, __u32 *, struct nlm_args *);
+int	nlmclt_encode_unlockargs(struct rpc_rqst *, __u32 *, struct nlm_args *);
  */
 
 #endif /* LOCKD_XDR_H */
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/lockd/xdr4.h linux-libc-headers-2.6.8.0/include/linux/lockd/xdr4.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/lockd/xdr4.h	2004-01-05 12:42:33.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/lockd/xdr4.h	2004-08-26 05:42:08.000000000 -0500
@@ -22,24 +22,24 @@
 
 
 
-int	nlm4svc_decode_testargs(struct svc_rqst *, u32 *, struct nlm_args *);
-int	nlm4svc_encode_testres(struct svc_rqst *, u32 *, struct nlm_res *);
-int	nlm4svc_decode_lockargs(struct svc_rqst *, u32 *, struct nlm_args *);
-int	nlm4svc_decode_cancargs(struct svc_rqst *, u32 *, struct nlm_args *);
-int	nlm4svc_decode_unlockargs(struct svc_rqst *, u32 *, struct nlm_args *);
-int	nlm4svc_encode_res(struct svc_rqst *, u32 *, struct nlm_res *);
-int	nlm4svc_decode_res(struct svc_rqst *, u32 *, struct nlm_res *);
-int	nlm4svc_encode_void(struct svc_rqst *, u32 *, void *);
-int	nlm4svc_decode_void(struct svc_rqst *, u32 *, void *);
-int	nlm4svc_decode_shareargs(struct svc_rqst *, u32 *, struct nlm_args *);
-int	nlm4svc_encode_shareres(struct svc_rqst *, u32 *, struct nlm_res *);
-int	nlm4svc_decode_notify(struct svc_rqst *, u32 *, struct nlm_args *);
-int	nlm4svc_decode_reboot(struct svc_rqst *, u32 *, struct nlm_reboot *);
+int	nlm4svc_decode_testargs(struct svc_rqst *, __u32 *, struct nlm_args *);
+int	nlm4svc_encode_testres(struct svc_rqst *, __u32 *, struct nlm_res *);
+int	nlm4svc_decode_lockargs(struct svc_rqst *, __u32 *, struct nlm_args *);
+int	nlm4svc_decode_cancargs(struct svc_rqst *, __u32 *, struct nlm_args *);
+int	nlm4svc_decode_unlockargs(struct svc_rqst *, __u32 *, struct nlm_args *);
+int	nlm4svc_encode_res(struct svc_rqst *, __u32 *, struct nlm_res *);
+int	nlm4svc_decode_res(struct svc_rqst *, __u32 *, struct nlm_res *);
+int	nlm4svc_encode_void(struct svc_rqst *, __u32 *, void *);
+int	nlm4svc_decode_void(struct svc_rqst *, __u32 *, void *);
+int	nlm4svc_decode_shareargs(struct svc_rqst *, __u32 *, struct nlm_args *);
+int	nlm4svc_encode_shareres(struct svc_rqst *, __u32 *, struct nlm_res *);
+int	nlm4svc_decode_notify(struct svc_rqst *, __u32 *, struct nlm_args *);
+int	nlm4svc_decode_reboot(struct svc_rqst *, __u32 *, struct nlm_reboot *);
 /*
-int	nlmclt_encode_testargs(struct rpc_rqst *, u32 *, struct nlm_args *);
-int	nlmclt_encode_lockargs(struct rpc_rqst *, u32 *, struct nlm_args *);
-int	nlmclt_encode_cancargs(struct rpc_rqst *, u32 *, struct nlm_args *);
-int	nlmclt_encode_unlockargs(struct rpc_rqst *, u32 *, struct nlm_args *);
+int	nlmclt_encode_testargs(struct rpc_rqst *, __u32 *, struct nlm_args *);
+int	nlmclt_encode_lockargs(struct rpc_rqst *, __u32 *, struct nlm_args *);
+int	nlmclt_encode_cancargs(struct rpc_rqst *, __u32 *, struct nlm_args *);
+int	nlmclt_encode_unlockargs(struct rpc_rqst *, __u32 *, struct nlm_args *);
  */
 
 #endif /* LOCKD_XDR4_H */
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/mca.h linux-libc-headers-2.6.8.0/include/linux/mca.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/mca.h	2004-08-18 13:16:03.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/mca.h	2004-08-26 05:42:08.000000000 -0500
@@ -50,7 +50,7 @@
 };
 
 struct mca_device {
-	u64			dma_mask;
+	__u64			dma_mask;
 	int			pos_id;
 	int			slot;
 
@@ -91,7 +91,7 @@
 };
 
 struct mca_bus {
-	u64			default_dma_mask;
+	__u64			default_dma_mask;
 	int			number;
 	struct mca_bus_accessor_functions f;
 	struct device		dev;
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/mii.h linux-libc-headers-2.6.8.0/include/linux/mii.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/mii.h	2004-06-23 16:52:55.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/mii.h	2004-08-26 05:42:08.000000000 -0500
@@ -138,10 +138,10 @@
 
 /* This structure is used in all SIOCxMIIxxx ioctl calls */
 struct mii_ioctl_data {
-	u16		phy_id;
-	u16		reg_num;
-	u16		val_in;
-	u16		val_out;
+	__u16		phy_id;
+	__u16		reg_num;
+	__u16		val_in;
+	__u16		val_out;
 };
 
 
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/mtd/map.h linux-libc-headers-2.6.8.0/include/linux/mtd/map.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/mtd/map.h	2004-08-18 13:16:06.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/mtd/map.h	2004-08-26 05:42:08.000000000 -0500
@@ -36,20 +36,20 @@
 	int buswidth; /* in octets */
 
 #ifdef CONFIG_MTD_COMPLEX_MAPPINGS
-	u8 (*read8)(struct map_info *, unsigned long);
-	u16 (*read16)(struct map_info *, unsigned long);
-	u32 (*read32)(struct map_info *, unsigned long);  
-	u64 (*read64)(struct map_info *, unsigned long);  
+	__u8 (*read8)(struct map_info *, unsigned long);
+	__u16 (*read16)(struct map_info *, unsigned long);
+	__u32 (*read32)(struct map_info *, unsigned long);  
+	__u64 (*read64)(struct map_info *, unsigned long);  
 	/* If it returned a 'long' I'd call it readl.
 	 * It doesn't.
 	 * I won't.
 	 * dwmw2 */
 	
 	void (*copy_from)(struct map_info *, void *, unsigned long, ssize_t);
-	void (*write8)(struct map_info *, u8, unsigned long);
-	void (*write16)(struct map_info *, u16, unsigned long);
-	void (*write32)(struct map_info *, u32, unsigned long);
-	void (*write64)(struct map_info *, u64, unsigned long);
+	void (*write8)(struct map_info *, __u8, unsigned long);
+	void (*write16)(struct map_info *, __u16, unsigned long);
+	void (*write32)(struct map_info *, __u32, unsigned long);
+	void (*write64)(struct map_info *, __u64, unsigned long);
 	void (*copy_to)(struct map_info *, unsigned long, const void *, ssize_t);
 
 	/* We can perhaps put in 'point' and 'unpoint' methods, if we really
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/mtd/nand.h linux-libc-headers-2.6.8.0/include/linux/mtd/nand.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/mtd/nand.h	2004-08-18 13:16:06.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/mtd/nand.h	2004-08-26 05:42:08.000000000 -0500
@@ -271,8 +271,8 @@
 	
 	u_char		(*read_byte)(struct mtd_info *mtd);
 	void		(*write_byte)(struct mtd_info *mtd, u_char byte);
-	u16		(*read_word)(struct mtd_info *mtd);
-	void		(*write_word)(struct mtd_info *mtd, u16 word);
+	__u16		(*read_word)(struct mtd_info *mtd);
+	void		(*write_word)(struct mtd_info *mtd, __u16 word);
 	
 	void		(*write_buf)(struct mtd_info *mtd, const u_char *buf, int len);
 	void		(*read_buf)(struct mtd_info *mtd, u_char *buf, int len);
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/mtd/pmc551.h linux-libc-headers-2.6.8.0/include/linux/mtd/pmc551.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/mtd/pmc551.h	2004-03-28 07:52:13.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/mtd/pmc551.h	2004-08-26 05:42:08.000000000 -0500
@@ -25,9 +25,9 @@
 struct mypriv {
         struct pci_dev *dev;
         u_char *start;
-        u32    base_map0;
-        u32    curr_map0;
-        u32    asize;
+        __u32    base_map0;
+        __u32    curr_map0;
+        __u32    asize;
 	struct mtd_info *nextpmc551;
 };                       
 
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/nbd.h linux-libc-headers-2.6.8.0/include/linux/nbd.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/nbd.h	2004-03-28 07:52:09.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/nbd.h	2004-08-26 05:42:08.000000000 -0500
@@ -45,11 +45,11 @@
  * server. All data are in network byte order.
  */
 struct nbd_request {
-	u32 magic;
-	u32 type;	/* == READ || == WRITE 	*/
+	__u32 magic;
+	__u32 type;	/* == READ || == WRITE 	*/
 	char handle[8];
-	u64 from;
-	u32 len;
+	__u64 from;
+	__u32 len;
 }
 #ifdef __GNUC__
 	__attribute__ ((packed))
@@ -61,8 +61,8 @@
  * it has completed an I/O request (or an error occurs).
  */
 struct nbd_reply {
-	u32 magic;
-	u32 error;		/* 0 = ok, else error	*/
+	__u32 magic;
+	__u32 error;		/* 0 = ok, else error	*/
 	char handle[8];		/* handle you got from request	*/
 };
 #endif
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/nfs_fs_i.h linux-libc-headers-2.6.8.0/include/linux/nfs_fs_i.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/nfs_fs_i.h	2004-01-17 17:04:31.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/nfs_fs_i.h	2004-08-26 05:42:08.000000000 -0500
@@ -8,8 +8,8 @@
  * NFS lock info
  */
 struct nfs_lock_info {
-	u32		state;
-	u32		flags;
+	__u32		state;
+	__u32		flags;
 	struct nlm_host	*host;
 };
 
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/nfs_fs_sb.h linux-libc-headers-2.6.8.0/include/linux/nfs_fs_sb.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/nfs_fs_sb.h	2004-06-09 07:00:50.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/nfs_fs_sb.h	2004-08-26 05:42:08.000000000 -0500
@@ -37,10 +37,10 @@
 	struct list_head	nfs4_siblings;	/* List of other nfs_server structs
 						 * that share the same clientid
 						 */
-	u32			attr_bitmask[2];/* V4 bitmask representing the set
+	__u32			attr_bitmask[2];/* V4 bitmask representing the set
 						   of attributes supported on this
 						   filesystem */
-	u32			acl_bitmask;	/* V4 bitmask representing the ACEs
+	__u32			acl_bitmask;	/* V4 bitmask representing the ACEs
 						   that are supported on this
 						   filesystem */
 #endif
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/nfs_xdr.h linux-libc-headers-2.6.8.0/include/linux/nfs_xdr.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/nfs_xdr.h	2004-06-09 07:00:50.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/nfs_xdr.h	2004-08-26 05:42:08.000000000 -0500
@@ -90,9 +90,9 @@
 };
 
 struct nfs4_change_info {
-	u32			atomic;
-	u64			before;
-	u64			after;
+	__u32			atomic;
+	__u64			before;
+	__u64			after;
 };
 
 /*
@@ -112,7 +112,7 @@
 	} u;
 	const struct qstr *	name;
 	const struct nfs_server *server;	 /* Needed for ID mapping */
-	const u32 *		bitmask;
+	const __u32 *		bitmask;
 };
 
 struct nfs_openres {
@@ -168,7 +168,7 @@
  *   */
 struct nfs_lowner {
 	__u64           clientid;
-	u32                     id;
+	__u32                     id;
 };
 
 struct nfs_open_to_lock {
@@ -328,7 +328,7 @@
 	nfs4_stateid                    stateid;
 	struct iattr *                  iap;
 	const struct nfs_server *	server; /* Needed for name mapping */
-	const u32 *			bitmask;
+	const __u32 *			bitmask;
 };
 
 struct nfs_setattrres {
@@ -482,32 +482,32 @@
 
 #ifdef CONFIG_NFS_V4
 
-typedef u64 clientid4;
+typedef __u64 clientid4;
 
 struct nfs4_accessargs {
 	const struct nfs_fh *		fh;
-	u32				access;
+	__u32				access;
 };
 
 struct nfs4_accessres {
-	u32				supported;
-	u32				access;
+	__u32				supported;
+	__u32				access;
 };
 
 struct nfs4_create_arg {
-	u32				ftype;
+	__u32				ftype;
 	union {
 		struct qstr *		symlink;    /* NF4LNK */
 		struct {
-			u32		specdata1;
-			u32		specdata2;
+			__u32		specdata1;
+			__u32		specdata2;
 		} device;    /* NF4BLK, NF4CHR */
 	} u;
 	const struct qstr *		name;
 	const struct nfs_server *	server;
 	const struct iattr *		attrs;
 	const struct nfs_fh *		dir_fh;
-	const u32 *			bitmask;
+	const __u32 *			bitmask;
 };
 
 struct nfs4_create_res {
@@ -519,12 +519,12 @@
 
 struct nfs4_fsinfo_arg {
 	const struct nfs_fh *		fh;
-	const u32 *			bitmask;
+	const __u32 *			bitmask;
 };
 
 struct nfs4_getattr_arg {
 	const struct nfs_fh *		fh;
-	const u32 *			bitmask;
+	const __u32 *			bitmask;
 };
 
 struct nfs4_getattr_res {
@@ -541,7 +541,7 @@
 struct nfs4_lookup_arg {
 	const struct nfs_fh *		dir_fh;
 	const struct qstr *		name;
-	const u32 *			bitmask;
+	const __u32 *			bitmask;
 };
 
 struct nfs4_lookup_res {
@@ -551,19 +551,19 @@
 };
 
 struct nfs4_lookup_root_arg {
-	const u32 *			bitmask;
+	const __u32 *			bitmask;
 };
 
 struct nfs4_pathconf_arg {
 	const struct nfs_fh *		fh;
-	const u32 *			bitmask;
+	const __u32 *			bitmask;
 };
 
 struct nfs4_readdir_arg {
 	const struct nfs_fh *		fh;
-	u64				cookie;
+	__u64				cookie;
 	nfs4_verifier			verifier;
-	u32				count;
+	__u32				count;
 	struct page **			pages;	/* zero-copy data */
 	unsigned int			pgbase;	/* zero-copy data */
 };
@@ -575,7 +575,7 @@
 
 struct nfs4_readlink {
 	const struct nfs_fh *		fh;
-	u32				count;   /* zero-copy data */
+	__u32				count;   /* zero-copy data */
 	struct page **			pages;   /* zero-copy data */
 };
 
@@ -599,23 +599,23 @@
 struct nfs4_setclientid {
 	nfs4_verifier			sc_verifier;      /* request */
 	char *				sc_name;	  /* request */
-	u32				sc_prog;          /* request */
+	__u32				sc_prog;          /* request */
 	char				sc_netid[4];	  /* request */
 	char				sc_uaddr[24];     /* request */
-	u32				sc_cb_ident;      /* request */
+	__u32				sc_cb_ident;      /* request */
 	struct nfs4_client *		sc_state;	  /* response */
 };
 
 struct nfs4_statfs_arg {
 	const struct nfs_fh *		fh;
-	const u32 *			bitmask;
+	const __u32 *			bitmask;
 };
 
 struct nfs4_server_caps_res {
-	u32				attr_bitmask[2];
-	u32				acl_bitmask;
-	u32				has_links;
-	u32				has_symlinks;
+	__u32				attr_bitmask[2];
+	__u32				acl_bitmask;
+	__u32				has_links;
+	__u32				has_symlinks;
 };
 
 #endif /* CONFIG_NFS_V4 */
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/nfsd/state.h linux-libc-headers-2.6.8.0/include/linux/nfsd/state.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/nfsd/state.h	2004-08-18 13:16:07.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/nfsd/state.h	2004-08-26 05:42:08.000000000 -0500
@@ -41,18 +41,18 @@
 
 #define NFS4_OPAQUE_LIMIT 1024
 typedef struct {
-	u32             cl_boot;
-	u32             cl_id;
+	__u32             cl_boot;
+	__u32             cl_id;
 } clientid_t;
 
 typedef struct {
-	u32             so_boot;
-	u32             so_stateownerid;
-	u32             so_fileid;
+	__u32             so_boot;
+	__u32             so_stateownerid;
+	__u32             so_fileid;
 } stateid_opaque_t;
 
 typedef struct {
-	u32                     si_generation;
+	__u32                     si_generation;
 	stateid_opaque_t        si_opaque;
 } stateid_t;
 #define si_boot           si_opaque.so_boot
@@ -68,14 +68,14 @@
 /* client delegation callback info */
 struct nfs4_callback {
 	/* SETCLIENTID info */
-	u32			cb_parsed;  /* addr parsed */
-	u32                     cb_addr;
+	__u32			cb_parsed;  /* addr parsed */
+	__u32                     cb_addr;
 	unsigned short          cb_port;
-	u32                     cb_prog;
-	u32                     cb_ident;
+	__u32                     cb_prog;
+	__u32                     cb_ident;
 	struct xdr_netobj	cb_netid;
 	/* RPC client info */
-	u32			cb_set;     /* successful CB_NULL call */
+	__u32			cb_set;     /* successful CB_NULL call */
 	struct rpc_program      cb_program;
 	struct rpc_stat         cb_stat;
 	struct rpc_clnt *       cb_client;
@@ -99,7 +99,7 @@
 	struct xdr_netobj	cl_name; 	/* id generated by client */
 	nfs4_verifier		cl_verifier; 	/* generated by client */
 	time_t                  cl_time;        /* time of last lease renewal */
-	u32			cl_addr; 	/* client ipaddress */
+	__u32			cl_addr; 	/* client ipaddress */
 	struct svc_cred		cl_cred; 	/* setclientid principal */
 	clientid_t		cl_clientid;	/* generated by server */
 	nfs4_verifier		cl_confirm;	/* generated by server */
@@ -116,7 +116,7 @@
 	struct list_head	cr_strhash;	/* hash by cr_name */
 	struct xdr_netobj 	cr_name; 	/* id generated by client */
 	time_t			cr_first_state; /* first state aquisition */
-	u32			cr_expired;     /* boolean: lease expired? */
+	__u32			cr_expired;     /* boolean: lease expired? */
 };
 
 static inline void
@@ -139,7 +139,7 @@
  * is cached. 
  */
 struct nfs4_replay {
-	u32			rp_status;
+	__u32			rp_status;
 	unsigned int		rp_buflen;
 	char			*rp_buf;
 	unsigned		intrp_allocated;
@@ -175,9 +175,9 @@
 	struct list_head	so_close_lru; /* tail queue */
 	time_t			so_time; /* time of placement on so_close_lru */
 	int			so_is_open_owner; /* 1=openowner,0=lockowner */
-	u32                     so_id;
+	__u32                     so_id;
 	struct nfs4_client *    so_client;
-	u32                     so_seqid;    
+	__u32                     so_seqid;    
 	struct xdr_netobj       so_owner;     /* open owner name */
 	int                     so_confirmed; /* successful OPEN_CONFIRM? */
 	struct nfs4_replay	so_replay;
@@ -192,7 +192,7 @@
 	struct list_head        fi_hash;    /* hash by "struct inode *" */
 	struct list_head        fi_perfile; /* list: nfs4_stateid */
 	struct inode		*fi_inode;
-	u32                     fi_id;      /* used with stateowner->so_id 
+	__u32                     fi_id;      /* used with stateowner->so_id 
 					     * for stateid_hashtbl hash */
 };
 
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/nfsd/xdr.h linux-libc-headers-2.6.8.0/include/linux/nfsd/xdr.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/nfsd/xdr.h	2004-08-18 13:16:07.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/nfsd/xdr.h	2004-08-26 05:42:08.000000000 -0500
@@ -83,7 +83,7 @@
 	struct svc_fh		fh;
 	__u32			cookie;
 	__u32			count;
-	u32 *			buffer;
+	__u32 *			buffer;
 };
 
 struct nfsd_attrstat {
@@ -107,9 +107,9 @@
 	int			count;
 
 	struct readdir_cd	common;
-	u32 *			buffer;
+	__u32 *			buffer;
 	int			buflen;
-	u32 *			offset;
+	__u32 *			offset;
 };
 
 struct nfsd_statfsres {
@@ -134,39 +134,39 @@
 #define NFS2_SVC_XDRSIZE	sizeof(union nfsd_xdrstore)
 
 
-int nfssvc_decode_void(struct svc_rqst *, u32 *, void *);
-int nfssvc_decode_fhandle(struct svc_rqst *, u32 *, struct nfsd_fhandle *);
-int nfssvc_decode_sattrargs(struct svc_rqst *, u32 *,
+int nfssvc_decode_void(struct svc_rqst *, __u32 *, void *);
+int nfssvc_decode_fhandle(struct svc_rqst *, __u32 *, struct nfsd_fhandle *);
+int nfssvc_decode_sattrargs(struct svc_rqst *, __u32 *,
 				struct nfsd_sattrargs *);
-int nfssvc_decode_diropargs(struct svc_rqst *, u32 *,
+int nfssvc_decode_diropargs(struct svc_rqst *, __u32 *,
 				struct nfsd_diropargs *);
-int nfssvc_decode_readargs(struct svc_rqst *, u32 *,
+int nfssvc_decode_readargs(struct svc_rqst *, __u32 *,
 				struct nfsd_readargs *);
-int nfssvc_decode_writeargs(struct svc_rqst *, u32 *,
+int nfssvc_decode_writeargs(struct svc_rqst *, __u32 *,
 				struct nfsd_writeargs *);
-int nfssvc_decode_createargs(struct svc_rqst *, u32 *,
+int nfssvc_decode_createargs(struct svc_rqst *, __u32 *,
 				struct nfsd_createargs *);
-int nfssvc_decode_renameargs(struct svc_rqst *, u32 *,
+int nfssvc_decode_renameargs(struct svc_rqst *, __u32 *,
 				struct nfsd_renameargs *);
-int nfssvc_decode_readlinkargs(struct svc_rqst *, u32 *,
+int nfssvc_decode_readlinkargs(struct svc_rqst *, __u32 *,
 				struct nfsd_readlinkargs *);
-int nfssvc_decode_linkargs(struct svc_rqst *, u32 *,
+int nfssvc_decode_linkargs(struct svc_rqst *, __u32 *,
 				struct nfsd_linkargs *);
-int nfssvc_decode_symlinkargs(struct svc_rqst *, u32 *,
+int nfssvc_decode_symlinkargs(struct svc_rqst *, __u32 *,
 				struct nfsd_symlinkargs *);
-int nfssvc_decode_readdirargs(struct svc_rqst *, u32 *,
+int nfssvc_decode_readdirargs(struct svc_rqst *, __u32 *,
 				struct nfsd_readdirargs *);
-int nfssvc_encode_void(struct svc_rqst *, u32 *, void *);
-int nfssvc_encode_attrstat(struct svc_rqst *, u32 *, struct nfsd_attrstat *);
-int nfssvc_encode_diropres(struct svc_rqst *, u32 *, struct nfsd_diropres *);
-int nfssvc_encode_readlinkres(struct svc_rqst *, u32 *, struct nfsd_readlinkres *);
-int nfssvc_encode_readres(struct svc_rqst *, u32 *, struct nfsd_readres *);
-int nfssvc_encode_statfsres(struct svc_rqst *, u32 *, struct nfsd_statfsres *);
-int nfssvc_encode_readdirres(struct svc_rqst *, u32 *, struct nfsd_readdirres *);
+int nfssvc_encode_void(struct svc_rqst *, __u32 *, void *);
+int nfssvc_encode_attrstat(struct svc_rqst *, __u32 *, struct nfsd_attrstat *);
+int nfssvc_encode_diropres(struct svc_rqst *, __u32 *, struct nfsd_diropres *);
+int nfssvc_encode_readlinkres(struct svc_rqst *, __u32 *, struct nfsd_readlinkres *);
+int nfssvc_encode_readres(struct svc_rqst *, __u32 *, struct nfsd_readres *);
+int nfssvc_encode_statfsres(struct svc_rqst *, __u32 *, struct nfsd_statfsres *);
+int nfssvc_encode_readdirres(struct svc_rqst *, __u32 *, struct nfsd_readdirres *);
 
 int nfssvc_encode_entry(struct readdir_cd *, const char *name,
 				int namlen, loff_t offset, ino_t ino, unsigned int);
 
-int nfssvc_release_fhandle(struct svc_rqst *, u32 *, struct nfsd_fhandle *);
+int nfssvc_release_fhandle(struct svc_rqst *, __u32 *, struct nfsd_fhandle *);
 
 #endif /* LINUX_NFSD_H */
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/nfsd/xdr3.h linux-libc-headers-2.6.8.0/include/linux/nfsd/xdr3.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/nfsd/xdr3.h	2004-08-18 13:16:07.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/nfsd/xdr3.h	2004-08-26 05:42:08.000000000 -0500
@@ -101,7 +101,7 @@
 	__u32			dircount;
 	__u32			count;
 	__u32 *			verf;
-	u32 *			buffer;
+	__u32 *			buffer;
 };
 
 struct nfsd3_commitargs {
@@ -167,10 +167,10 @@
 	__u32			verf[2];
 
 	struct readdir_cd	common;
-	u32 *			buffer;
+	__u32 *			buffer;
 	int			buflen;
-	u32 *			offset;
-	u32 *			offset1;
+	__u32 *			offset;
+	__u32 *			offset1;
 	struct svc_rqst *	rqstp;
 
 };
@@ -245,70 +245,70 @@
 
 #define NFS3_SVC_XDRSIZE		sizeof(union nfsd3_xdrstore)
 
-int nfs3svc_decode_fhandle(struct svc_rqst *, u32 *, struct nfsd_fhandle *);
-int nfs3svc_decode_sattrargs(struct svc_rqst *, u32 *,
+int nfs3svc_decode_fhandle(struct svc_rqst *, __u32 *, struct nfsd_fhandle *);
+int nfs3svc_decode_sattrargs(struct svc_rqst *, __u32 *,
 				struct nfsd3_sattrargs *);
-int nfs3svc_decode_diropargs(struct svc_rqst *, u32 *,
+int nfs3svc_decode_diropargs(struct svc_rqst *, __u32 *,
 				struct nfsd3_diropargs *);
-int nfs3svc_decode_accessargs(struct svc_rqst *, u32 *,
+int nfs3svc_decode_accessargs(struct svc_rqst *, __u32 *,
 				struct nfsd3_accessargs *);
-int nfs3svc_decode_readargs(struct svc_rqst *, u32 *,
+int nfs3svc_decode_readargs(struct svc_rqst *, __u32 *,
 				struct nfsd3_readargs *);
-int nfs3svc_decode_writeargs(struct svc_rqst *, u32 *,
+int nfs3svc_decode_writeargs(struct svc_rqst *, __u32 *,
 				struct nfsd3_writeargs *);
-int nfs3svc_decode_createargs(struct svc_rqst *, u32 *,
+int nfs3svc_decode_createargs(struct svc_rqst *, __u32 *,
 				struct nfsd3_createargs *);
-int nfs3svc_decode_mkdirargs(struct svc_rqst *, u32 *,
+int nfs3svc_decode_mkdirargs(struct svc_rqst *, __u32 *,
 				struct nfsd3_createargs *);
-int nfs3svc_decode_mknodargs(struct svc_rqst *, u32 *,
+int nfs3svc_decode_mknodargs(struct svc_rqst *, __u32 *,
 				struct nfsd3_mknodargs *);
-int nfs3svc_decode_renameargs(struct svc_rqst *, u32 *,
+int nfs3svc_decode_renameargs(struct svc_rqst *, __u32 *,
 				struct nfsd3_renameargs *);
-int nfs3svc_decode_readlinkargs(struct svc_rqst *, u32 *,
+int nfs3svc_decode_readlinkargs(struct svc_rqst *, __u32 *,
 				struct nfsd3_readlinkargs *);
-int nfs3svc_decode_linkargs(struct svc_rqst *, u32 *,
+int nfs3svc_decode_linkargs(struct svc_rqst *, __u32 *,
 				struct nfsd3_linkargs *);
-int nfs3svc_decode_symlinkargs(struct svc_rqst *, u32 *,
+int nfs3svc_decode_symlinkargs(struct svc_rqst *, __u32 *,
 				struct nfsd3_symlinkargs *);
-int nfs3svc_decode_readdirargs(struct svc_rqst *, u32 *,
+int nfs3svc_decode_readdirargs(struct svc_rqst *, __u32 *,
 				struct nfsd3_readdirargs *);
-int nfs3svc_decode_readdirplusargs(struct svc_rqst *, u32 *,
+int nfs3svc_decode_readdirplusargs(struct svc_rqst *, __u32 *,
 				struct nfsd3_readdirargs *);
-int nfs3svc_decode_commitargs(struct svc_rqst *, u32 *,
+int nfs3svc_decode_commitargs(struct svc_rqst *, __u32 *,
 				struct nfsd3_commitargs *);
-int nfs3svc_encode_voidres(struct svc_rqst *, u32 *, void *);
-int nfs3svc_encode_attrstat(struct svc_rqst *, u32 *,
+int nfs3svc_encode_voidres(struct svc_rqst *, __u32 *, void *);
+int nfs3svc_encode_attrstat(struct svc_rqst *, __u32 *,
 				struct nfsd3_attrstat *);
-int nfs3svc_encode_wccstat(struct svc_rqst *, u32 *,
+int nfs3svc_encode_wccstat(struct svc_rqst *, __u32 *,
 				struct nfsd3_attrstat *);
-int nfs3svc_encode_diropres(struct svc_rqst *, u32 *,
+int nfs3svc_encode_diropres(struct svc_rqst *, __u32 *,
 				struct nfsd3_diropres *);
-int nfs3svc_encode_accessres(struct svc_rqst *, u32 *,
+int nfs3svc_encode_accessres(struct svc_rqst *, __u32 *,
 				struct nfsd3_accessres *);
-int nfs3svc_encode_readlinkres(struct svc_rqst *, u32 *,
+int nfs3svc_encode_readlinkres(struct svc_rqst *, __u32 *,
 				struct nfsd3_readlinkres *);
-int nfs3svc_encode_readres(struct svc_rqst *, u32 *, struct nfsd3_readres *);
-int nfs3svc_encode_writeres(struct svc_rqst *, u32 *, struct nfsd3_writeres *);
-int nfs3svc_encode_createres(struct svc_rqst *, u32 *,
+int nfs3svc_encode_readres(struct svc_rqst *, __u32 *, struct nfsd3_readres *);
+int nfs3svc_encode_writeres(struct svc_rqst *, __u32 *, struct nfsd3_writeres *);
+int nfs3svc_encode_createres(struct svc_rqst *, __u32 *,
 				struct nfsd3_diropres *);
-int nfs3svc_encode_renameres(struct svc_rqst *, u32 *,
+int nfs3svc_encode_renameres(struct svc_rqst *, __u32 *,
 				struct nfsd3_renameres *);
-int nfs3svc_encode_linkres(struct svc_rqst *, u32 *,
+int nfs3svc_encode_linkres(struct svc_rqst *, __u32 *,
 				struct nfsd3_linkres *);
-int nfs3svc_encode_readdirres(struct svc_rqst *, u32 *,
+int nfs3svc_encode_readdirres(struct svc_rqst *, __u32 *,
 				struct nfsd3_readdirres *);
-int nfs3svc_encode_fsstatres(struct svc_rqst *, u32 *,
+int nfs3svc_encode_fsstatres(struct svc_rqst *, __u32 *,
 				struct nfsd3_fsstatres *);
-int nfs3svc_encode_fsinfores(struct svc_rqst *, u32 *,
+int nfs3svc_encode_fsinfores(struct svc_rqst *, __u32 *,
 				struct nfsd3_fsinfores *);
-int nfs3svc_encode_pathconfres(struct svc_rqst *, u32 *,
+int nfs3svc_encode_pathconfres(struct svc_rqst *, __u32 *,
 				struct nfsd3_pathconfres *);
-int nfs3svc_encode_commitres(struct svc_rqst *, u32 *,
+int nfs3svc_encode_commitres(struct svc_rqst *, __u32 *,
 				struct nfsd3_commitres *);
 
-int nfs3svc_release_fhandle(struct svc_rqst *, u32 *,
+int nfs3svc_release_fhandle(struct svc_rqst *, __u32 *,
 				struct nfsd3_attrstat *);
-int nfs3svc_release_fhandle2(struct svc_rqst *, u32 *,
+int nfs3svc_release_fhandle2(struct svc_rqst *, __u32 *,
 				struct nfsd3_fhandle_pair *);
 int nfs3svc_encode_entry(struct readdir_cd *, const char *name,
 				int namlen, loff_t offset, ino_t ino,
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/nfsd/xdr4.h linux-libc-headers-2.6.8.0/include/linux/nfsd/xdr4.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/nfsd/xdr4.h	2004-08-18 13:16:07.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/nfsd/xdr4.h	2004-08-26 05:42:08.000000000 -0500
@@ -42,9 +42,9 @@
 #define NFSD4_MAX_TAGLEN	128
 #define XDR_LEN(n)                     (((n) + 3) & ~3)
 
-typedef u32 delegation_zero_t;
-typedef u32 delegation_boot_t;
-typedef u64 delegation_id_t;
+typedef __u32 delegation_zero_t;
+typedef __u32 delegation_boot_t;
+typedef __u64 delegation_id_t;
 
 typedef struct {
 	delegation_zero_t	ds_zero;
@@ -53,46 +53,46 @@
 } delegation_stateid_t;
 
 struct nfsd4_change_info {
-	u32		atomic;
-	u32		before_ctime_sec;
-	u32		before_ctime_nsec;
-	u32		after_ctime_sec;
-	u32		after_ctime_nsec;
+	__u32		atomic;
+	__u32		before_ctime_sec;
+	__u32		before_ctime_nsec;
+	__u32		after_ctime_sec;
+	__u32		after_ctime_nsec;
 };
 
 struct nfsd4_access {
-	u32		ac_req_access;      /* request */
-	u32		ac_supported;       /* response */
-	u32		ac_resp_access;     /* response */
+	__u32		ac_req_access;      /* request */
+	__u32		ac_supported;       /* response */
+	__u32		ac_resp_access;     /* response */
 };
 
 struct nfsd4_close {
-	u32		cl_seqid;           /* request */
+	__u32		cl_seqid;           /* request */
 	stateid_t	cl_stateid;         /* request+response */
 	struct nfs4_stateowner * cl_stateowner;	/* response */
 };
 
 struct nfsd4_commit {
-	u64		co_offset;          /* request */
-	u32		co_count;           /* request */
+	__u64		co_offset;          /* request */
+	__u32		co_count;           /* request */
 	nfs4_verifier	co_verf;            /* response */
 };
 
 struct nfsd4_create {
-	u32		cr_namelen;         /* request */
+	__u32		cr_namelen;         /* request */
 	char *		cr_name;            /* request */
-	u32		cr_type;            /* request */
+	__u32		cr_type;            /* request */
 	union {                             /* request */
 		struct {
-			u32 namelen;
+			__u32 namelen;
 			char *name;
 		} link;   /* NF4LNK */
 		struct {
-			u32 specdata1;
-			u32 specdata2;
+			__u32 specdata1;
+			__u32 specdata2;
 		} dev;    /* NF4BLK, NF4CHR */
 	} u;
-	u32		cr_bmval[2];        /* request */
+	__u32		cr_bmval[2];        /* request */
 	struct iattr	cr_iattr;           /* request */
 	struct nfsd4_change_info  cr_cinfo; /* response */
 };
@@ -102,41 +102,41 @@
 #define cr_specdata2	u.dev.specdata2
 
 struct nfsd4_getattr {
-	u32		ga_bmval[2];        /* request */
+	__u32		ga_bmval[2];        /* request */
 	struct svc_fh	*ga_fhp;            /* response */
 };
 
 struct nfsd4_link {
-	u32		li_namelen;         /* request */
+	__u32		li_namelen;         /* request */
 	char *		li_name;            /* request */
 	struct nfsd4_change_info  li_cinfo; /* response */
 };
 
 struct nfsd4_lock_denied {
 	struct nfs4_stateowner   *ld_sop;
-	u64             ld_start;
-	u64             ld_length;
-	u32             ld_type;
+	__u64             ld_start;
+	__u64             ld_length;
+	__u32             ld_type;
 };
 
 struct nfsd4_lock {
 	/* request */
-	u32             lk_type;
-	u32             lk_reclaim;         /* boolean */
-	u64             lk_offset;
-	u64             lk_length;
-	u32             lk_is_new;
+	__u32             lk_type;
+	__u32             lk_reclaim;         /* boolean */
+	__u64             lk_offset;
+	__u64             lk_length;
+	__u32             lk_is_new;
 	union {
 		struct {
-			u32             open_seqid;
+			__u32             open_seqid;
 			stateid_t       open_stateid;
-			u32             lock_seqid;
+			__u32             lock_seqid;
 			clientid_t      clientid;
 			struct xdr_netobj owner;
 		} new;
 		struct {
 			stateid_t       lock_stateid;
-			u32             lock_seqid;
+			__u32             lock_seqid;
 		} old;
 	} v;
 
@@ -164,56 +164,56 @@
 
 
 struct nfsd4_lockt {
-	u32				lt_type;
+	__u32				lt_type;
 	clientid_t			lt_clientid;
 	struct xdr_netobj		lt_owner;
-	u64				lt_offset;
-	u64				lt_length;
+	__u64				lt_offset;
+	__u64				lt_length;
 	struct nfs4_stateowner * 	lt_stateowner;
 	struct nfsd4_lock_denied  	lt_denied;
 };
 
  
 struct nfsd4_locku {
-	u32             lu_type;
-	u32             lu_seqid;
+	__u32             lu_type;
+	__u32             lu_seqid;
 	stateid_t       lu_stateid;
-	u64             lu_offset;
-	u64             lu_length;
+	__u64             lu_offset;
+	__u64             lu_length;
 	struct nfs4_stateowner  *lu_stateowner;
 };
 
 
 struct nfsd4_lookup {
-	u32		lo_len;             /* request */
+	__u32		lo_len;             /* request */
 	char *		lo_name;            /* request */
 };
 
 struct nfsd4_putfh {
-	u32		pf_fhlen;           /* request */
+	__u32		pf_fhlen;           /* request */
 	char		*pf_fhval;          /* request */
 };
 
 struct nfsd4_open {
-	u32		op_claim_type;      /* request */
+	__u32		op_claim_type;      /* request */
 	struct xdr_netobj op_fname;	    /* request - everything but CLAIM_PREV */
-	u32		op_delegate_type;   /* request - CLAIM_PREV only */
+	__u32		op_delegate_type;   /* request - CLAIM_PREV only */
 	delegation_stateid_t	op_delegate_stateid; /* request - CLAIM_DELEGATE_CUR only */
-	u32		op_create;     	    /* request */
-	u32		op_createmode;      /* request */
-	u32		op_bmval[2];        /* request */
+	__u32		op_create;     	    /* request */
+	__u32		op_createmode;      /* request */
+	__u32		op_bmval[2];        /* request */
 	union {                             /* request */
 		struct iattr	iattr;		            /* UNCHECKED4,GUARDED4 */
 		nfs4_verifier	verf;		                     /* EXCLUSIVE4 */
 	} u;
 	clientid_t	op_clientid;        /* request */
 	struct xdr_netobj op_owner;           /* request */
-	u32		op_seqid;           /* request */
-	u32		op_share_access;    /* request */
-	u32		op_share_deny;      /* request */
+	__u32		op_seqid;           /* request */
+	__u32		op_share_access;    /* request */
+	__u32		op_share_deny;      /* request */
 	stateid_t	op_stateid;         /* response */
 	struct nfsd4_change_info  op_cinfo; /* response */
-	u32		op_rflags;          /* response */
+	__u32		op_rflags;          /* response */
 	int		op_truncate;        /* used during processing */
 	struct nfs4_stateowner *op_stateowner; /* used during processing */
 
@@ -223,24 +223,24 @@
 
 struct nfsd4_open_confirm {
 	stateid_t	oc_req_stateid		/* request */;
-	u32		oc_seqid    		/* request */;
+	__u32		oc_seqid    		/* request */;
 	stateid_t	oc_resp_stateid		/* response */;
 	struct nfs4_stateowner * oc_stateowner;	/* response */
 };
 
 struct nfsd4_open_downgrade {
 	stateid_t       od_stateid;
-	u32             od_seqid;
-	u32             od_share_access;
-	u32             od_share_deny;
+	__u32             od_seqid;
+	__u32             od_share_access;
+	__u32             od_share_deny;
 	struct nfs4_stateowner *od_stateowner;
 };
 
 
 struct nfsd4_read {
 	stateid_t	rd_stateid;         /* request */
-	u64		rd_offset;          /* request */
-	u32		rd_length;          /* request */
+	__u64		rd_offset;          /* request */
+	__u32		rd_length;          /* request */
 	struct kvec	rd_iov[RPCSVC_MAXPAGES];
 	int		rd_vlen;
 	
@@ -249,18 +249,18 @@
 };
 
 struct nfsd4_readdir {
-	u64		rd_cookie;          /* request */
+	__u64		rd_cookie;          /* request */
 	nfs4_verifier	rd_verf;            /* request */
-	u32		rd_dircount;        /* request */
-	u32		rd_maxcount;        /* request */
-	u32		rd_bmval[2];        /* request */
+	__u32		rd_dircount;        /* request */
+	__u32		rd_maxcount;        /* request */
+	__u32		rd_bmval[2];        /* request */
 	struct svc_rqst *rd_rqstp;          /* response */
 	struct svc_fh * rd_fhp;             /* response */
 
 	struct readdir_cd	common;
-	u32 *			buffer;
+	__u32 *			buffer;
 	int			buflen;
-	u32 *			offset;
+	__u32 *			offset;
 };
 
 struct nfsd4_release_lockowner {
@@ -273,15 +273,15 @@
 };
 
 struct nfsd4_remove {
-	u32		rm_namelen;         /* request */
+	__u32		rm_namelen;         /* request */
 	char *		rm_name;            /* request */
 	struct nfsd4_change_info  rm_cinfo; /* response */
 };
 
 struct nfsd4_rename {
-	u32		rn_snamelen;        /* request */
+	__u32		rn_snamelen;        /* request */
 	char *		rn_sname;           /* request */
-	u32		rn_tnamelen;        /* request */
+	__u32		rn_tnamelen;        /* request */
 	char *		rn_tname;           /* request */
 	struct nfsd4_change_info  rn_sinfo; /* response */
 	struct nfsd4_change_info  rn_tinfo; /* response */
@@ -289,20 +289,20 @@
 
 struct nfsd4_setattr {
 	stateid_t	sa_stateid;         /* request */
-	u32		sa_bmval[2];        /* request */
+	__u32		sa_bmval[2];        /* request */
 	struct iattr	sa_iattr;           /* request */
 };
 
 struct nfsd4_setclientid {
 	nfs4_verifier	se_verf;            /* request */
-	u32		se_namelen;         /* request */
+	__u32		se_namelen;         /* request */
 	char *		se_name;            /* request */
-	u32		se_callback_prog;   /* request */
-	u32		se_callback_netid_len;  /* request */
+	__u32		se_callback_prog;   /* request */
+	__u32		se_callback_netid_len;  /* request */
 	char *		se_callback_netid_val;  /* request */
-	u32		se_callback_addr_len;   /* request */
+	__u32		se_callback_addr_len;   /* request */
 	char *		se_callback_addr_val;   /* request */
-	u32		se_callback_ident;  /* request */
+	__u32		se_callback_ident;  /* request */
 	clientid_t	se_clientid;        /* response */
 	nfs4_verifier	se_confirm;         /* response */
 };
@@ -314,21 +314,21 @@
 
 /* also used for NVERIFY */
 struct nfsd4_verify {
-	u32		ve_bmval[2];        /* request */
-	u32		ve_attrlen;         /* request */
+	__u32		ve_bmval[2];        /* request */
+	__u32		ve_attrlen;         /* request */
 	char *		ve_attrval;         /* request */
 };
 
 struct nfsd4_write {
 	stateid_t	wr_stateid;         /* request */
-	u64		wr_offset;          /* request */
-	u32		wr_stable_how;      /* request */
-	u32		wr_buflen;          /* request */
+	__u64		wr_offset;          /* request */
+	__u32		wr_stable_how;      /* request */
+	__u32		wr_buflen;          /* request */
 	struct kvec	wr_vec[RPCSVC_MAXPAGES]; /* request */
 	int		wr_vlen;
 
-	u32		wr_bytes_written;   /* response */
-	u32		wr_how_written;     /* response */
+	__u32		wr_bytes_written;   /* response */
+	__u32		wr_how_written;     /* response */
 	nfs4_verifier	wr_verifier;        /* response */
 };
 
@@ -370,12 +370,12 @@
 
 struct nfsd4_compoundargs {
 	/* scratch variables for XDR decode */
-	u32 *				p;
-	u32 *				end;
+	__u32 *				p;
+	__u32 *				end;
 	struct page **			pagelist;
 	int				pagelen;
-	u32				tmp[8];
-	u32 *				tmpp;
+	__u32				tmp[8];
+	__u32 *				tmpp;
 	struct tmpbuf {
 		struct tmpbuf *next;
 		void (*release)(const void *);
@@ -384,25 +384,25 @@
 
 	struct svc_rqst			*rqstp;
 
-	u32				taglen;
+	__u32				taglen;
 	char *				tag;
-	u32				minorversion;
-	u32				opcnt;
+	__u32				minorversion;
+	__u32				opcnt;
 	struct nfsd4_op			*ops;
 	struct nfsd4_op			iops[8];
 };
 
 struct nfsd4_compoundres {
 	/* scratch variables for XDR encode */
-	u32 *				p;
-	u32 *				end;
+	__u32 *				p;
+	__u32 *				end;
 	struct xdr_buf *		xbuf;
 	struct svc_rqst *		rqstp;
 
-	u32				taglen;
+	__u32				taglen;
 	char *				tag;
-	u32				opcnt;
-	u32 *				tagp; /* where to encode tag and  opcount */
+	__u32				opcnt;
+	__u32 *				tagp; /* where to encode tag and  opcount */
 };
 
 #define NFS4_SVC_XDRSIZE		sizeof(struct nfsd4_compoundargs)
@@ -418,16 +418,16 @@
 	cinfo->after_ctime_nsec = fhp->fh_post_ctime.tv_nsec;
 }
 
-int nfs4svc_encode_voidres(struct svc_rqst *, u32 *, void *);
-int nfs4svc_decode_compoundargs(struct svc_rqst *, u32 *, 
+int nfs4svc_encode_voidres(struct svc_rqst *, __u32 *, void *);
+int nfs4svc_decode_compoundargs(struct svc_rqst *, __u32 *, 
 		struct nfsd4_compoundargs *);
-int nfs4svc_encode_compoundres(struct svc_rqst *, u32 *, 
+int nfs4svc_encode_compoundres(struct svc_rqst *, __u32 *, 
 		struct nfsd4_compoundres *);
 void nfsd4_encode_operation(struct nfsd4_compoundres *, struct nfsd4_op *);
 void nfsd4_encode_replay(struct nfsd4_compoundres *resp, struct nfsd4_op *op);
 int nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp,
-		       struct dentry *dentry, u32 *buffer, int *countp, 
-		       u32 *bmval, struct svc_rqst *);
+		       struct dentry *dentry, __u32 *buffer, int *countp, 
+		       __u32 *bmval, struct svc_rqst *);
 extern int nfsd4_setclientid(struct svc_rqst *rqstp, 
 		struct nfsd4_setclientid *setclid);
 extern int nfsd4_setclientid_confirm(struct svc_rqst *rqstp, 
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/pmu.h linux-libc-headers-2.6.8.0/include/linux/pmu.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/pmu.h	2004-01-17 17:04:31.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/pmu.h	2004-08-26 05:42:08.000000000 -0500
@@ -120,15 +120,15 @@
 
 /* no param */
 #define PMU_IOC_SLEEP		_IO('B', 0)
-/* out param: u32*	backlight value: 0 to 15 */
+/* out param: __u32*	backlight value: 0 to 15 */
 #define PMU_IOC_GET_BACKLIGHT	_IOR('B', 1, size_t)
-/* in param: u32	backlight value: 0 to 15 */
+/* in param: __u32	backlight value: 0 to 15 */
 #define PMU_IOC_SET_BACKLIGHT	_IOW('B', 2, size_t)
-/* out param: u32*	PMU model */
+/* out param: __u32*	PMU model */
 #define PMU_IOC_GET_MODEL	_IOR('B', 3, size_t)
-/* out param: u32*	has_adb: 0 or 1 */
+/* out param: __u32*	has_adb: 0 or 1 */
 #define PMU_IOC_HAS_ADB		_IOR('B', 4, size_t) 
-/* out param: u32*	can_sleep: 0 or 1 */
+/* out param: __u32*	can_sleep: 0 or 1 */
 #define PMU_IOC_CAN_SLEEP	_IOR('B', 5, size_t) 
 /* no param, but historically was _IOR('B', 6, 0), meaning 4 bytes */
 #define PMU_IOC_GRAB_BACKLIGHT	_IOR('B', 6, size_t) 
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/reiserfs_fs.h linux-libc-headers-2.6.8.0/include/linux/reiserfs_fs.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/reiserfs_fs.h	2004-08-18 13:16:04.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/reiserfs_fs.h	2004-08-26 13:26:06.000000000 -0500
@@ -1821,7 +1821,7 @@
  * to use for a new object underneat it.  The locality is returned
  * in disk byte order (le).
  */
-u32 reiserfs_choose_packing(struct inode *dir);
+__u32 reiserfs_choose_packing(struct inode *dir);
 
 int is_reusable (struct super_block * s, b_blocknr_t block, int bit_value);
 void reiserfs_free_block (struct reiserfs_transaction_handle *th, struct inode *, b_blocknr_t, int for_unformatted);
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/scx200_gpio.h linux-libc-headers-2.6.8.0/include/linux/scx200_gpio.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/scx200_gpio.h	2004-01-17 17:04:32.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/scx200_gpio.h	2004-08-26 13:26:01.000000000 -0500
@@ -1,5 +1,5 @@
 
-u32 scx200_gpio_configure(int index, u32 set, u32 clear);
+__u32 scx200_gpio_configure(int index, __u32 set, __u32 clear);
 void scx200_gpio_dump(unsigned index);
 
 extern unsigned scx200_gpio_base;
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/sdladrv.h linux-libc-headers-2.6.8.0/include/linux/sdladrv.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/sdladrv.h	2003-12-15 12:46:58.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/sdladrv.h	2004-08-26 05:42:08.000000000 -0500
@@ -55,8 +55,8 @@
 extern int sdla_inten	(sdlahw_t* hw);
 extern int sdla_intde	(sdlahw_t* hw);
 extern int sdla_intack	(sdlahw_t* hw);
-extern void S514_intack  (sdlahw_t* hw, u32 int_status);
-extern void read_S514_int_stat (sdlahw_t* hw, u32* int_status);
+extern void S514_intack  (sdlahw_t* hw, __u32 int_status);
+extern void read_S514_int_stat (sdlahw_t* hw, __u32* int_status);
 extern int sdla_intr	(sdlahw_t* hw);
 extern int sdla_mapmem	(sdlahw_t* hw, unsigned long addr);
 extern int sdla_peek	(sdlahw_t* hw, unsigned long addr, void* buf,
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/selection.h linux-libc-headers-2.6.8.0/include/linux/selection.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/selection.h	2004-06-23 16:52:56.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/selection.h	2004-08-26 05:42:08.000000000 -0500
@@ -32,14 +32,14 @@
 extern int default_blu[];
 
 extern unsigned short *screen_pos(int currcons, int w_offset, int viewed);
-extern u16 screen_glyph(int currcons, int offset);
+extern __u16 screen_glyph(int currcons, int offset);
 extern void complement_pos(int currcons, int offset);
 extern void invert_screen(int currcons, int offset, int count, int shift);
 
 extern void getconsxy(int currcons, unsigned char *p);
 extern void putconsxy(int currcons, unsigned char *p);
 
-extern u16 vcs_scr_readw(int currcons, const u16 *org);
-extern void vcs_scr_writew(int currcons, u16 val, u16 *org);
+extern __u16 vcs_scr_readw(int currcons, const __u16 *org);
+extern void vcs_scr_writew(int currcons, __u16 val, __u16 *org);
 
 #endif
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/serialP.h linux-libc-headers-2.6.8.0/include/linux/serialP.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/serialP.h	2004-08-18 13:16:04.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/serialP.h	2004-08-26 05:42:08.000000000 -0500
@@ -39,8 +39,8 @@
 	int	xmit_fifo_size;
 	int	custom_divisor;
 	int	count;
-	u8	*iomem_base;
-	u16	iomem_reg_shift;
+	__u8	*iomem_base;
+	__u16	iomem_reg_shift;
 	unsigned short	close_delay;
 	unsigned short	closing_wait; /* time to wait before closing */
 	struct async_icount	icount;	
@@ -75,8 +75,8 @@
 	int			blocked_open; /* # of blocked opens */
  	struct circ_buf		xmit;
  	spinlock_t		xmit_lock;
-	u8			*iomem_base;
-	u16			iomem_reg_shift;
+	__u8			*iomem_base;
+	__u16			iomem_reg_shift;
 	int			io_type;
 	struct work_struct			work;
 	struct tasklet_struct	tlet;
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/sunrpc/clnt.h linux-libc-headers-2.6.8.0/include/linux/sunrpc/clnt.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/sunrpc/clnt.h	2004-02-29 10:36:05.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/sunrpc/clnt.h	2004-08-26 05:42:08.000000000 -0500
@@ -36,7 +36,7 @@
 	atomic_t		cl_users;	/* number of references */
 	struct rpc_xprt *	cl_xprt;	/* transport */
 	struct rpc_procinfo *	cl_procinfo;	/* procedure info */
-	u32			cl_maxproc;	/* max procedure number */
+	__u32			cl_maxproc;	/* max procedure number */
 
 	char *			cl_server;	/* server machine name */
 	char *			cl_protname;	/* protocol name */
@@ -75,7 +75,7 @@
 #define RPC_MAXVERSION		4
 struct rpc_program {
 	char *			name;		/* protocol name */
-	u32			number;		/* program number */
+	__u32			number;		/* program number */
 	unsigned int		nrvers;		/* number of versions */
 	struct rpc_version **	version;	/* version array */
 	struct rpc_stat *	stats;		/* statistics */
@@ -83,7 +83,7 @@
 };
 
 struct rpc_version {
-	u32			number;		/* version number */
+	__u32			number;		/* version number */
 	unsigned int		nrprocs;	/* number of procs */
 	struct rpc_procinfo *	procs;		/* procedure array */
 };
@@ -92,7 +92,7 @@
  * Procedure information
  */
 struct rpc_procinfo {
-	u32			p_proc;		/* RPC procedure number */
+	__u32			p_proc;		/* RPC procedure number */
 	kxdrproc_t		p_encode;	/* XDR encode function */
 	kxdrproc_t		p_decode;	/* XDR decode function */
 	unsigned int		p_bufsiz;	/* req. buffer size */
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/sunrpc/gss_asn1.h linux-libc-headers-2.6.8.0/include/linux/sunrpc/gss_asn1.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/sunrpc/gss_asn1.h	2004-06-23 16:52:58.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/sunrpc/gss_asn1.h	2004-08-26 13:26:25.000000000 -0500
@@ -64,14 +64,14 @@
    (((o1)->len == (o2)->len) && \
     (memcmp((o1)->data,(o2)->data,(int) (o1)->len) == 0))
 
-u32 g_verify_token_header(
+__u32 g_verify_token_header(
      struct xdr_netobj *mech,
      int *body_size,
      unsigned char **buf_in,
      int tok_type,
      int toksize);
 
-u32 g_get_mech_oid(struct xdr_netobj *mech, struct xdr_netobj * in_buf);
+__u32 g_get_mech_oid(struct xdr_netobj *mech, struct xdr_netobj * in_buf);
 
 int g_token_size(
      struct xdr_netobj *mech,
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/sunrpc/gss_krb5.h linux-libc-headers-2.6.8.0/include/linux/sunrpc/gss_krb5.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/sunrpc/gss_krb5.h	2004-06-23 16:52:58.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/sunrpc/gss_krb5.h	2004-08-26 13:26:21.000000000 -0500
@@ -46,8 +46,8 @@
 	int			sealalg;
 	struct crypto_tfm	*enc;
 	struct crypto_tfm	*seq;
-	s32			endtime;
-	u32			seq_send;
+	__s32			endtime;
+	__u32			seq_send;
 	struct xdr_netobj	mech_used;
 };
 
@@ -112,35 +112,35 @@
 #define ENCTYPE_DES3_CBC_SHA1   0x0010
 #define ENCTYPE_UNKNOWN         0x01ff
 
-s32
-make_checksum(s32 cksumtype, char *header, int hdrlen, struct xdr_buf *body,
+__s32
+make_checksum(__s32 cksumtype, char *header, int hdrlen, struct xdr_buf *body,
 		   struct xdr_netobj *cksum);
 
-u32
+__u32
 krb5_make_token(struct krb5_ctx *context_handle, int qop_req,
 	struct xdr_buf *input_message_buffer,
 	struct xdr_netobj *output_message_buffer, int toktype);
 
-u32
+__u32
 krb5_read_token(struct krb5_ctx *context_handle,
 	  struct xdr_netobj *input_token_buffer,
 	  struct xdr_buf *message_buffer,
 	  int *qop_state, int toktype);
 
-u32
+__u32
 krb5_encrypt(struct crypto_tfm * key,
 	     void *iv, void *in, void *out, int length);
 
-u32
+__u32
 krb5_decrypt(struct crypto_tfm * key,
 	     void *iv, void *in, void *out, int length); 
 
-s32
+__s32
 krb5_make_seq_num(struct crypto_tfm * key,
 		int direction,
-		s32 seqnum, unsigned char *cksum, unsigned char *buf);
+		__s32 seqnum, unsigned char *cksum, unsigned char *buf);
 
-s32
+__s32
 krb5_get_seq_num(struct crypto_tfm * key,
 	       unsigned char *cksum,
-	       unsigned char *buf, int *direction, s32 * seqnum);
+	       unsigned char *buf, int *direction, __s32 * seqnum);
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/sunrpc/svc.h linux-libc-headers-2.6.8.0/include/linux/sunrpc/svc.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/sunrpc/svc.h	2004-08-18 13:16:07.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/sunrpc/svc.h	2004-08-26 05:42:08.000000000 -0500
@@ -75,20 +75,20 @@
  */
 #define RPCSVC_MAXPAGES		((RPCSVC_MAXPAYLOAD+PAGE_SIZE-1)/PAGE_SIZE + 2)
 
-static inline u32 svc_getu32(struct kvec *iov)
+static inline __u32 svc_getu32(struct kvec *iov)
 {
-	u32 val, *vp;
+	__u32 val, *vp;
 	vp = iov->iov_base;
 	val = *vp++;
 	iov->iov_base = (void*)vp;
-	iov->iov_len -= sizeof(u32);
+	iov->iov_len -= sizeof(__u32);
 	return val;
 }
-static inline void svc_putu32(struct kvec *iov, u32 val)
+static inline void svc_putu32(struct kvec *iov, __u32 val)
 {
-	u32 *vp = iov->iov_base + iov->iov_len;
+	__u32 *vp = iov->iov_base + iov->iov_len;
 	*vp = val;
-	iov->iov_len += sizeof(u32);
+	iov->iov_len += sizeof(__u32);
 }
 
 	
@@ -119,11 +119,11 @@
 	short			rq_arghi;	/* pages available in argument page list */
 	short			rq_resused;	/* pages used for result */
 
-	u32			rq_xid;		/* transmission id */
-	u32			rq_prog;	/* program number */
-	u32			rq_vers;	/* program version */
-	u32			rq_proc;	/* procedure number */
-	u32			rq_prot;	/* IP protocol */
+	__u32			rq_xid;		/* transmission id */
+	__u32			rq_prog;	/* program number */
+	__u32			rq_vers;	/* program version */
+	__u32			rq_proc;	/* procedure number */
+	__u32			rq_prot;	/* IP protocol */
 	unsigned short
 				rq_secure  : 1;	/* secure port */
 
@@ -156,7 +156,7 @@
  * Check buffer bounds after decoding arguments
  */
 static inline int
-xdr_argsize_check(struct svc_rqst *rqstp, u32 *p)
+xdr_argsize_check(struct svc_rqst *rqstp, __u32 *p)
 {
 	char *cp = (char *)p;
 	struct kvec *vec = &rqstp->rq_arg.head[0];
@@ -164,7 +164,7 @@
 }
 
 static inline int
-xdr_ressize_check(struct svc_rqst *rqstp, u32 *p)
+xdr_ressize_check(struct svc_rqst *rqstp, __u32 *p)
 {
 	struct kvec *vec = &rqstp->rq_res.head[0];
 	char *cp = (char*)p;
@@ -220,19 +220,19 @@
 }
 
 struct svc_deferred_req {
-	u32			prot;	/* protocol (UDP or TCP) */
+	__u32			prot;	/* protocol (UDP or TCP) */
 	struct sockaddr_in	addr;
 	struct svc_sock		*svsk;	/* where reply must go */
 	struct cache_deferred_req handle;
 	int			argslen;
-	u32			args[0];
+	__u32			args[0];
 };
 
 /*
  * RPC program
  */
 struct svc_program {
-	u32			pg_prog;	/* program number */
+	__u32			pg_prog;	/* program number */
 	unsigned int		pg_lovers;	/* lowest version */
 	unsigned int		pg_hivers;	/* lowest version */
 	unsigned int		pg_nvers;	/* number of versions */
@@ -246,16 +246,16 @@
  * RPC program version
  */
 struct svc_version {
-	u32			vs_vers;	/* version number */
-	u32			vs_nproc;	/* number of procedures */
+	__u32			vs_vers;	/* version number */
+	__u32			vs_nproc;	/* number of procedures */
 	struct svc_procedure *	vs_proc;	/* per-procedure info */
-	u32			vs_xdrsize;	/* xdrsize needed for this version */
+	__u32			vs_xdrsize;	/* xdrsize needed for this version */
 
 	/* Override dispatch function (e.g. when caching replies).
 	 * A return value of 0 means drop the request. 
 	 * vs_dispatch == NULL means use default dispatcher.
 	 */
-	int			(*vs_dispatch)(struct svc_rqst *, u32 *);
+	int			(*vs_dispatch)(struct svc_rqst *, __u32 *);
 };
 
 /*
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/sunrpc/xprt.h linux-libc-headers-2.6.8.0/include/linux/sunrpc/xprt.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/sunrpc/xprt.h	2004-06-23 16:52:58.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/sunrpc/xprt.h	2004-08-26 05:42:08.000000000 -0500
@@ -93,7 +93,7 @@
 	__u32			rq_xid;		/* request XID */
 	int			rq_cong;	/* has incremented xprt->cong */
 	int			rq_received;	/* receive completed */
-	u32			rq_seqno;	/* gss seq no. used on req. */
+	__u32			rq_seqno;	/* gss seq no. used on req. */
 
 	struct list_head	rq_list;
 
@@ -106,13 +106,13 @@
 	/*
 	 * For authentication (e.g. auth_des)
 	 */
-	u32			rq_creddata[2];
+	__u32			rq_creddata[2];
 	
 	/*
 	 * Partial send handling
 	 */
 	
-	u32			rq_bytes_sent;	/* Bytes we have sent */
+	__u32			rq_bytes_sent;	/* Bytes we have sent */
 
 	unsigned long		rq_xtime;	/* when transmitted */
 	int			rq_ntrans;
@@ -160,7 +160,7 @@
 	/*
 	 * State of TCP reply receive stuff
 	 */
-	u32			tcp_recm,	/* Fragment header */
+	__u32			tcp_recm,	/* Fragment header */
 				tcp_xid,	/* Current XID */
 				tcp_reclen,	/* fragment length */
 				tcp_offset;	/* fragment offset */
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/suspend.h linux-libc-headers-2.6.8.0/include/linux/suspend.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/suspend.h	2004-08-18 13:16:05.000000000 -0500
+++ linux-libc-headers-2.6.8.0/include/linux/suspend.h	2004-08-26 05:42:08.000000000 -0500
@@ -23,7 +23,7 @@
 #define SWAP_FILENAME_MAXLENGTH	32
 
 struct suspend_header {
-	u32 version_code;
+	__u32 version_code;
 	unsigned long num_physpages;
 	char machine[8];
 	char version[20];
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/sysdev.h linux-libc-headers-2.6.8.0/include/linux/sysdev.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/sysdev.h	2004-03-28 07:52:11.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/sysdev.h	2004-08-26 05:42:08.000000000 -0500
@@ -31,7 +31,7 @@
 
 	/* Default operations for these types of devices */
 	int	(*shutdown)(struct sys_device *);
-	int	(*suspend)(struct sys_device *, u32 state);
+	int	(*suspend)(struct sys_device *, __u32 state);
 	int	(*resume)(struct sys_device *);
 	struct kset		kset;
 };
@@ -50,7 +50,7 @@
 	int	(*add)(struct sys_device *);
 	int	(*remove)(struct sys_device *);
 	int	(*shutdown)(struct sys_device *);
-	int	(*suspend)(struct sys_device *, u32 state);
+	int	(*suspend)(struct sys_device *, __u32 state);
 	int	(*resume)(struct sys_device *);
 };
 
@@ -65,7 +65,7 @@
  */
 
 struct sys_device {
-	u32		id;
+	__u32		id;
 	struct sysdev_class	* cls;
 	struct kobject		kobj;
 };
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/sysv_fs.h linux-libc-headers-2.6.8.0/include/linux/sysv_fs.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/sysv_fs.h	2003-12-15 12:46:58.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/sysv_fs.h	2004-08-26 05:42:08.000000000 -0500
@@ -9,12 +9,12 @@
 
 
 /* inode numbers are 16 bit */
-typedef u16 sysv_ino_t;
+typedef __u16 sysv_ino_t;
 
 /* Block numbers are 24 bit, sometimes stored in 32 bit.
    On Coherent FS, they are always stored in PDP-11 manner: the least
    significant 16 bits come last. */
-typedef u32 sysv_zone_t;
+typedef __u32 sysv_zone_t;
 
 /* 0 is non-existent */
 #define SYSV_BADBL_INO	1	/* inode of bad blocks file */
@@ -25,29 +25,29 @@
 #define XENIX_NICINOD	100	/* number of inode cache entries */
 #define XENIX_NICFREE	100	/* number of free block list chunk entries */
 struct xenix_super_block {
-	u16		s_isize; /* index of first data zone */
-	u32		s_fsize __packed2__; /* total number of zones of this fs */
+	__u16		s_isize; /* index of first data zone */
+	__u32		s_fsize __packed2__; /* total number of zones of this fs */
 	/* the start of the free block list: */
-	u16		s_nfree;	/* number of free blocks in s_free, <= XENIX_NICFREE */
-	u32		s_free[XENIX_NICFREE]; /* first free block list chunk */
+	__u16		s_nfree;	/* number of free blocks in s_free, <= XENIX_NICFREE */
+	__u32		s_free[XENIX_NICFREE]; /* first free block list chunk */
 	/* the cache of free inodes: */
-	u16		s_ninode; /* number of free inodes in s_inode, <= XENIX_NICINOD */
+	__u16		s_ninode; /* number of free inodes in s_inode, <= XENIX_NICINOD */
 	sysv_ino_t	s_inode[XENIX_NICINOD]; /* some free inodes */
 	/* locks, not used by Linux: */
 	char		s_flock;	/* lock during free block list manipulation */
 	char		s_ilock;	/* lock during inode cache manipulation */
 	char		s_fmod;		/* super-block modified flag */
 	char		s_ronly;	/* flag whether fs is mounted read-only */
-	u32		s_time __packed2__; /* time of last super block update */
-	u32		s_tfree __packed2__; /* total number of free zones */
-	u16		s_tinode;	/* total number of free inodes */
-	s16		s_dinfo[4];	/* device information ?? */
+	__u32		s_time __packed2__; /* time of last super block update */
+	__u32		s_tfree __packed2__; /* total number of free zones */
+	__u16		s_tinode;	/* total number of free inodes */
+	__s16		s_dinfo[4];	/* device information ?? */
 	char		s_fname[6];	/* file system volume name */
 	char		s_fpack[6];	/* file system pack name */
 	char		s_clean;	/* set to 0x46 when filesystem is properly unmounted */
 	char		s_fill[371];
-	s32		s_magic;	/* version of file system */
-	s32		s_type;		/* type of file system: 1 for 512 byte blocks
+	__s32		s_magic;	/* version of file system */
+	__s32		s_type;		/* type of file system: 1 for 512 byte blocks
 								2 for 1024 byte blocks
 								3 for 2048 byte blocks */
 								
@@ -63,61 +63,61 @@
 
 /* SystemV4 super-block data on disk */
 struct sysv4_super_block {
-	u16	s_isize;	/* index of first data zone */
-	u16	s_pad0;
-	u32	s_fsize;	/* total number of zones of this fs */
+	__u16	s_isize;	/* index of first data zone */
+	__u16	s_pad0;
+	__u32	s_fsize;	/* total number of zones of this fs */
 	/* the start of the free block list: */
-	u16	s_nfree;	/* number of free blocks in s_free, <= SYSV_NICFREE */
-	u16	s_pad1;
-	u32	s_free[SYSV_NICFREE]; /* first free block list chunk */
+	__u16	s_nfree;	/* number of free blocks in s_free, <= SYSV_NICFREE */
+	__u16	s_pad1;
+	__u32	s_free[SYSV_NICFREE]; /* first free block list chunk */
 	/* the cache of free inodes: */
-	u16	s_ninode;	/* number of free inodes in s_inode, <= SYSV_NICINOD */
-	u16	s_pad2;
+	__u16	s_ninode;	/* number of free inodes in s_inode, <= SYSV_NICINOD */
+	__u16	s_pad2;
 	sysv_ino_t     s_inode[SYSV_NICINOD]; /* some free inodes */
 	/* locks, not used by Linux: */
 	char	s_flock;	/* lock during free block list manipulation */
 	char	s_ilock;	/* lock during inode cache manipulation */
 	char	s_fmod;		/* super-block modified flag */
 	char	s_ronly;	/* flag whether fs is mounted read-only */
-	u32	s_time;		/* time of last super block update */
-	s16	s_dinfo[4];	/* device information ?? */
-	u32	s_tfree;	/* total number of free zones */
-	u16	s_tinode;	/* total number of free inodes */
-	u16	s_pad3;
+	__u32	s_time;		/* time of last super block update */
+	__s16	s_dinfo[4];	/* device information ?? */
+	__u32	s_tfree;	/* total number of free zones */
+	__u16	s_tinode;	/* total number of free inodes */
+	__u16	s_pad3;
 	char	s_fname[6];	/* file system volume name */
 	char	s_fpack[6];	/* file system pack name */
-	s32	s_fill[12];
-	s32	s_state;	/* file system state: 0x7c269d38-s_time means clean */
-	s32	s_magic;	/* version of file system */
-	s32	s_type;		/* type of file system: 1 for 512 byte blocks
+	__s32	s_fill[12];
+	__s32	s_state;	/* file system state: 0x7c269d38-s_time means clean */
+	__s32	s_magic;	/* version of file system */
+	__s32	s_type;		/* type of file system: 1 for 512 byte blocks
 								2 for 1024 byte blocks */
 };
 
 /* SystemV2 super-block data on disk */
 struct sysv2_super_block {
-	u16	s_isize; 		/* index of first data zone */
-	u32	s_fsize __packed2__;	/* total number of zones of this fs */
+	__u16	s_isize; 		/* index of first data zone */
+	__u32	s_fsize __packed2__;	/* total number of zones of this fs */
 	/* the start of the free block list: */
-	u16	s_nfree;		/* number of free blocks in s_free, <= SYSV_NICFREE */
-	u32	s_free[SYSV_NICFREE];	/* first free block list chunk */
+	__u16	s_nfree;		/* number of free blocks in s_free, <= SYSV_NICFREE */
+	__u32	s_free[SYSV_NICFREE];	/* first free block list chunk */
 	/* the cache of free inodes: */
-	u16	s_ninode;		/* number of free inodes in s_inode, <= SYSV_NICINOD */
+	__u16	s_ninode;		/* number of free inodes in s_inode, <= SYSV_NICINOD */
 	sysv_ino_t     s_inode[SYSV_NICINOD]; /* some free inodes */
 	/* locks, not used by Linux: */
 	char	s_flock;		/* lock during free block list manipulation */
 	char	s_ilock;		/* lock during inode cache manipulation */
 	char	s_fmod;			/* super-block modified flag */
 	char	s_ronly;		/* flag whether fs is mounted read-only */
-	u32	s_time __packed2__;	/* time of last super block update */
-	s16	s_dinfo[4];		/* device information ?? */
-	u32	s_tfree __packed2__;	/* total number of free zones */
-	u16	s_tinode;		/* total number of free inodes */
+	__u32	s_time __packed2__;	/* time of last super block update */
+	__s16	s_dinfo[4];		/* device information ?? */
+	__u32	s_tfree __packed2__;	/* total number of free zones */
+	__u16	s_tinode;		/* total number of free inodes */
 	char	s_fname[6];		/* file system volume name */
 	char	s_fpack[6];		/* file system pack name */
-	s32	s_fill[14];
-	s32	s_state;		/* file system state: 0xcb096f43 means clean */
-	s32	s_magic;		/* version of file system */
-	s32	s_type;			/* type of file system: 1 for 512 byte blocks
+	__s32	s_fill[14];
+	__s32	s_state;		/* file system state: 0xcb096f43 means clean */
+	__s32	s_magic;		/* version of file system */
+	__s32	s_type;			/* type of file system: 1 for 512 byte blocks
 								2 for 1024 byte blocks */
 };
 
@@ -125,25 +125,25 @@
 #define V7_NICINOD     100     /* number of inode cache entries */
 #define V7_NICFREE     50      /* number of free block list chunk entries */
 struct v7_super_block {
-	u16    s_isize;        /* index of first data zone */
-	u32    s_fsize __packed2__; /* total number of zones of this fs */
+	__u16    s_isize;        /* index of first data zone */
+	__u32    s_fsize __packed2__; /* total number of zones of this fs */
 	/* the start of the free block list: */
-	u16    s_nfree;        /* number of free blocks in s_free, <= V7_NICFREE */
-	u32    s_free[V7_NICFREE]; /* first free block list chunk */
+	__u16    s_nfree;        /* number of free blocks in s_free, <= V7_NICFREE */
+	__u32    s_free[V7_NICFREE]; /* first free block list chunk */
 	/* the cache of free inodes: */
-	u16    s_ninode;       /* number of free inodes in s_inode, <= V7_NICINOD */
+	__u16    s_ninode;       /* number of free inodes in s_inode, <= V7_NICINOD */
 	sysv_ino_t      s_inode[V7_NICINOD]; /* some free inodes */
 	/* locks, not used by Linux or V7: */
 	char    s_flock;        /* lock during free block list manipulation */
 	char    s_ilock;        /* lock during inode cache manipulation */
 	char    s_fmod;         /* super-block modified flag */
 	char    s_ronly;        /* flag whether fs is mounted read-only */
-	u32     s_time __packed2__; /* time of last super block update */
+	__u32     s_time __packed2__; /* time of last super block update */
 	/* the following fields are not maintained by V7: */
-	u32     s_tfree __packed2__; /* total number of free zones */
-	u16     s_tinode;       /* total number of free inodes */
-	u16     s_m;            /* interleave factor */
-	u16     s_n;            /* interleave factor */
+	__u32     s_tfree __packed2__; /* total number of free zones */
+	__u16     s_tinode;       /* total number of free inodes */
+	__u16     s_m;            /* interleave factor */
+	__u16     s_n;            /* interleave factor */
 	char    s_fname[6];     /* file system name */
 	char    s_fpack[6];     /* file system pack name */
 };
@@ -152,41 +152,41 @@
 #define COH_NICINOD	100	/* number of inode cache entries */
 #define COH_NICFREE	64	/* number of free block list chunk entries */
 struct coh_super_block {
-	u16		s_isize;	/* index of first data zone */
-	u32		s_fsize __packed2__; /* total number of zones of this fs */
+	__u16		s_isize;	/* index of first data zone */
+	__u32		s_fsize __packed2__; /* total number of zones of this fs */
 	/* the start of the free block list: */
-	u16 s_nfree;	/* number of free blocks in s_free, <= COH_NICFREE */
-	u32		s_free[COH_NICFREE] __packed2__; /* first free block list chunk */
+	__u16 s_nfree;	/* number of free blocks in s_free, <= COH_NICFREE */
+	__u32		s_free[COH_NICFREE] __packed2__; /* first free block list chunk */
 	/* the cache of free inodes: */
-	u16		s_ninode;	/* number of free inodes in s_inode, <= COH_NICINOD */
+	__u16		s_ninode;	/* number of free inodes in s_inode, <= COH_NICINOD */
 	sysv_ino_t	s_inode[COH_NICINOD]; /* some free inodes */
 	/* locks, not used by Linux: */
 	char		s_flock;	/* lock during free block list manipulation */
 	char		s_ilock;	/* lock during inode cache manipulation */
 	char		s_fmod;		/* super-block modified flag */
 	char		s_ronly;	/* flag whether fs is mounted read-only */
-	u32		s_time __packed2__; /* time of last super block update */
-	u32		s_tfree __packed2__; /* total number of free zones */
-	u16		s_tinode;	/* total number of free inodes */
-	u16		s_interleave_m;	/* interleave factor */
-	u16		s_interleave_n;
+	__u32		s_time __packed2__; /* time of last super block update */
+	__u32		s_tfree __packed2__; /* total number of free zones */
+	__u16		s_tinode;	/* total number of free inodes */
+	__u16		s_interleave_m;	/* interleave factor */
+	__u16		s_interleave_n;
 	char		s_fname[6];	/* file system volume name */
 	char		s_fpack[6];	/* file system pack name */
-	u32		s_unique;	/* zero, not used */
+	__u32		s_unique;	/* zero, not used */
 };
 
 /* SystemV/Coherent inode data on disk */
 struct sysv_inode {
-	u16 i_mode;
-	u16 i_nlink;
-	u16 i_uid;
-	u16 i_gid;
-	u32 i_size;
-	u8  i_data[3*(10+1+1+1)];
-	u8  i_gen;
-	u32 i_atime;	/* time of last access */
-	u32 i_mtime;	/* time of last modification */
-	u32 i_ctime;	/* time of creation */
+	__u16 i_mode;
+	__u16 i_nlink;
+	__u16 i_uid;
+	__u16 i_gid;
+	__u32 i_size;
+	__u8  i_data[3*(10+1+1+1)];
+	__u8  i_gen;
+	__u32 i_atime;	/* time of last access */
+	__u32 i_mtime;	/* time of last modification */
+	__u32 i_ctime;	/* time of creation */
 };
 
 /* SystemV/Coherent directory entry on disk */
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/tiocl.h linux-libc-headers-2.6.8.0/include/linux/tiocl.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/tiocl.h	2003-12-15 12:46:58.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/tiocl.h	2004-08-26 05:42:08.000000000 -0500
@@ -23,7 +23,7 @@
 
 #define TIOCL_SELLOADLUT	5
 	/* set characters to be considered alphabetic when selecting */
-	/* u32[8] bit array, 4 bytes-aligned with type */
+	/* __u32[8] bit array, 4 bytes-aligned with type */
 
 /* these two don't return a value: they write it back in the type */
 #define TIOCL_GETSHIFTSTATE	6	/* write shift state */
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/umem.h linux-libc-headers-2.6.8.0/include/linux/umem.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/umem.h	2003-12-15 12:46:58.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/umem.h	2004-08-26 05:42:08.000000000 -0500
@@ -110,19 +110,19 @@
 #define DMA_WRITE_TO_HOST 1
 
 struct mm_dma_desc {
-	u64	pci_addr;
-	u64	local_addr;
-	u32	transfer_size;
-	u32	zero1;
-	u64	next_desc_addr;
-	u64	sem_addr;
-	u32	control_bits;
-	u32	zero2;
+	__u64	pci_addr;
+	__u64	local_addr;
+	__u32	transfer_size;
+	__u32	zero1;
+	__u64	next_desc_addr;
+	__u64	sem_addr;
+	__u32	control_bits;
+	__u32	zero2;
 
 	dma_addr_t data_dma_handle;
 
 	/* Copy of the bits */
-	u64	sem_control_bits;
+	__u64	sem_control_bits;
 } __attribute__((aligned(8)));
 
 #define PCI_VENDOR_ID_MICRO_MEMORY		0x1332
diff -urN linux-libc-headers-2.6.8.0-dist/include/linux/vt_buffer.h linux-libc-headers-2.6.8.0/include/linux/vt_buffer.h
--- linux-libc-headers-2.6.8.0-dist/include/linux/vt_buffer.h	2004-01-17 17:04:33.000000000 -0600
+++ linux-libc-headers-2.6.8.0/include/linux/vt_buffer.h	2004-08-26 05:42:08.000000000 -0500
@@ -28,7 +28,7 @@
 #endif
 
 #ifndef VT_BUF_HAVE_MEMSETW
-static inline void scr_memsetw(u16 *s, u16 c, unsigned int count)
+static inline void scr_memsetw(__u16 *s, __u16 c, unsigned int count)
 {
 	count /= 2;
 	while (count--)
@@ -37,7 +37,7 @@
 #endif
 
 #ifndef VT_BUF_HAVE_MEMCPYW
-static inline void scr_memcpyw(u16 *d, const u16 *s, unsigned int count)
+static inline void scr_memcpyw(__u16 *d, const __u16 *s, unsigned int count)
 {
 	count /= 2;
 	while (count--)
@@ -46,7 +46,7 @@
 #endif
 
 #ifndef VT_BUF_HAVE_MEMMOVEW
-static inline void scr_memmovew(u16 *d, const u16 *s, unsigned int count)
+static inline void scr_memmovew(__u16 *d, const __u16 *s, unsigned int count)
 {
 	if (d < s)
 		scr_memcpyw(d, s, count);