Changeset 1238


Ignore:
Timestamp:
2005-06-14T18:42:32+02:00 (11 years ago)
Author:
nbd
Message:

fix prom_getenv on ar7

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/openwrt/target/linux/linux-2.4/patches/ar7/000-ar7_support.patch

    r1237 r1238  
    1 diff -ruN linux_2_4_30/Makefile linux/Makefile 
    2 --- linux_2_4_30/Makefile       2005-05-22 18:23:27.000000000 +0000 
    3 +++ linux/Makefile      2005-06-12 11:49:50.000000000 +0000 
     1diff -urN linux-2.4.30/Makefile linux-2.4.30.dev/Makefile 
     2--- linux-2.4.30/Makefile       2005-06-14 18:42:06.000000000 +0200 
     3+++ linux-2.4.30.dev/Makefile   2005-06-14 15:36:59.000000000 +0200 
    44@@ -91,7 +91,7 @@ 
    55  
     
    1111 ifndef CONFIG_FRAME_POINTER 
    1212 CFLAGS += -fomit-frame-pointer 
    13 diff -ruN linux_2_4_30/arch/mips/Makefile linux/arch/mips/Makefile 
    14 --- linux_2_4_30/arch/mips/Makefile     2005-05-22 18:24:01.000000000 +0000 
    15 +++ linux/arch/mips/Makefile    2005-06-11 09:41:27.000000000 +0000 
     13diff -urN linux-2.4.30/arch/mips/Makefile linux-2.4.30.dev/arch/mips/Makefile 
     14--- linux-2.4.30/arch/mips/Makefile     2005-06-14 18:42:06.000000000 +0200 
     15+++ linux-2.4.30.dev/arch/mips/Makefile 2005-06-14 15:36:59.000000000 +0200 
    1616@@ -369,6 +369,16 @@ 
    1717 endif 
     
    3131 # 
    3232 ifdef CONFIG_DECSTATION 
    33 diff -ruN linux_2_4_30/arch/mips/ar7/Makefile linux/arch/mips/ar7/Makefile 
    34 --- linux_2_4_30/arch/mips/ar7/Makefile 1970-01-01 00:00:00.000000000 +0000 
    35 +++ linux/arch/mips/ar7/Makefile        2005-06-11 12:36:01.000000000 +0000 
     33diff -urN linux-2.4.30/arch/mips/ar7/Makefile linux-2.4.30.dev/arch/mips/ar7/Makefile 
     34--- linux-2.4.30/arch/mips/ar7/Makefile 1970-01-01 01:00:00.000000000 +0100 
     35+++ linux-2.4.30.dev/arch/mips/ar7/Makefile     2005-06-14 15:36:59.000000000 +0200 
    3636@@ -0,0 +1,12 @@ 
    3737+.S.s: 
     
    4747+ 
    4848+include $(TOPDIR)/Rules.make 
    49 diff -ruN linux_2_4_30/arch/mips/ar7/avalanche/Makefile linux/arch/mips/ar7/avalanche/Makefile 
    50 --- linux_2_4_30/arch/mips/ar7/avalanche/Makefile       1970-01-01 00:00:00.000000000 +0000 
    51 +++ linux/arch/mips/ar7/avalanche/Makefile      2005-06-11 07:59:49.000000000 +0000 
     49diff -urN linux-2.4.30/arch/mips/ar7/avalanche/Makefile linux-2.4.30.dev/arch/mips/ar7/avalanche/Makefile 
     50--- linux-2.4.30/arch/mips/ar7/avalanche/Makefile       1970-01-01 01:00:00.000000000 +0100 
     51+++ linux-2.4.30.dev/arch/mips/ar7/avalanche/Makefile   2005-06-14 15:36:59.000000000 +0200 
    5252@@ -0,0 +1,13 @@ 
    5353+.S.s: 
     
    6464+ 
    6565+include $(TOPDIR)/Rules.make 
    66 diff -ruN linux_2_4_30/arch/mips/ar7/avalanche/avalanche_jump.S linux/arch/mips/ar7/avalanche/avalanche_jump.S 
    67 --- linux_2_4_30/arch/mips/ar7/avalanche/avalanche_jump.S       1970-01-01 00:00:00.000000000 +0000 
    68 +++ linux/arch/mips/ar7/avalanche/avalanche_jump.S      2005-06-11 17:20:29.000000000 +0000 
     66diff -urN linux-2.4.30/arch/mips/ar7/avalanche/avalanche_jump.S linux-2.4.30.dev/arch/mips/ar7/avalanche/avalanche_jump.S 
     67--- linux-2.4.30/arch/mips/ar7/avalanche/avalanche_jump.S       1970-01-01 01:00:00.000000000 +0100 
     68+++ linux-2.4.30.dev/arch/mips/ar7/avalanche/avalanche_jump.S   2005-06-14 15:36:59.000000000 +0200 
    6969@@ -0,0 +1,69 @@ 
    7070+#include <linux/config.h> 
     
    137137+ 
    138138+       .set at 
    139 diff -ruN linux_2_4_30/arch/mips/ar7/avalanche/avalanche_paging.c linux/arch/mips/ar7/avalanche/avalanche_paging.c 
    140 --- linux_2_4_30/arch/mips/ar7/avalanche/avalanche_paging.c     1970-01-01 00:00:00.000000000 +0000 
    141 +++ linux/arch/mips/ar7/avalanche/avalanche_paging.c    2005-06-12 10:21:34.000000000 +0000 
     139diff -urN linux-2.4.30/arch/mips/ar7/avalanche/avalanche_paging.c linux-2.4.30.dev/arch/mips/ar7/avalanche/avalanche_paging.c 
     140--- linux-2.4.30/arch/mips/ar7/avalanche/avalanche_paging.c     1970-01-01 01:00:00.000000000 +0100 
     141+++ linux-2.4.30.dev/arch/mips/ar7/avalanche/avalanche_paging.c 2005-06-14 15:36:59.000000000 +0200 
    142142@@ -0,0 +1,314 @@ 
    143143+/* 
     
    455455+       return; 
    456456+} 
    457 diff -ruN linux_2_4_30/arch/mips/ar7/cmdline.c linux/arch/mips/ar7/cmdline.c 
    458 --- linux_2_4_30/arch/mips/ar7/cmdline.c        1970-01-01 00:00:00.000000000 +0000 
    459 +++ linux/arch/mips/ar7/cmdline.c       2005-06-12 08:55:20.000000000 +0000 
     457diff -urN linux-2.4.30/arch/mips/ar7/cmdline.c linux-2.4.30.dev/arch/mips/ar7/cmdline.c 
     458--- linux-2.4.30/arch/mips/ar7/cmdline.c        1970-01-01 01:00:00.000000000 +0100 
     459+++ linux-2.4.30.dev/arch/mips/ar7/cmdline.c    2005-06-14 15:36:59.000000000 +0200 
    460460@@ -0,0 +1,64 @@ 
    461461+/* 
     
    523523+       *cp = '\0'; 
    524524+} 
    525 diff -ruN linux_2_4_30/arch/mips/ar7/init.c linux/arch/mips/ar7/init.c 
    526 --- linux_2_4_30/arch/mips/ar7/init.c   1970-01-01 00:00:00.000000000 +0000 
    527 +++ linux/arch/mips/ar7/init.c  2005-06-11 10:43:59.000000000 +0000 
    528 @@ -0,0 +1,127 @@ 
     525diff -urN linux-2.4.30/arch/mips/ar7/init.c linux-2.4.30.dev/arch/mips/ar7/init.c 
     526--- linux-2.4.30/arch/mips/ar7/init.c   1970-01-01 01:00:00.000000000 +0100 
     527+++ linux-2.4.30.dev/arch/mips/ar7/init.c       2005-06-14 19:15:15.000000000 +0200 
     528@@ -0,0 +1,144 @@ 
    529529+/* 
    530530+ * Carsten Langgaard, carstenl@mips.com 
     
    564564+int *_prom_argv, *_prom_envp; 
    565565+ 
    566 +/* 
    567 + * YAMON (32-bit PROM) pass arguments and environment as 32-bit pointer. 
    568 + * This macro take care of sign extension, if running in 64-bit mode. 
    569 + */ 
    570 +#define prom_envp(index) ((char *)(((int *)(int)_prom_envp)[(index)])) 
     566+/* max # of Adam2 environment variables */ 
     567+#define MAX_ENV_ENTRY 80 
     568+ 
     569+static t_env_var local_envp[MAX_ENV_ENTRY]; 
    571570+ 
    572571+int init_debug = 0; 
     
    581580+        */ 
    582581+       int i, index=0; 
     582+       t_env_var *env = (t_env_var *) local_envp; 
    583583+ 
    584584+       i = strlen(envname); 
    585 + 
    586 +       while (prom_envp(index)) { 
    587 +               if(strncmp(envname, prom_envp(index), i) == 0) { 
    588 +                       return(prom_envp(index+1)); 
     585+       while (env->name) { 
     586+               if(strncmp(envname, env->name, i) == 0) { 
     587+                       return(env->val); 
    589588+               } 
    590 +               index += 2; 
     589+               env++; 
    591590+       } 
    592591+ 
     
    642641+int __init prom_init(int argc, char **argv, char **envp) 
    643642+{ 
     643+       int i; 
     644+       t_env_var *env = (t_env_var *) envp; 
     645+ 
    644646+       prom_argc = argc; 
    645647+       _prom_argv = (int *)argv; 
    646648+       _prom_envp = (int *)envp; 
    647649+ 
     650+       /* Copy what we need locally so we are not dependent on 
     651+        * bootloader RAM.  In Adam2, the environment parameters 
     652+        * are in flash but the table that references them is in 
     653+        * RAM 
     654+        */ 
     655+       for(i=0; i < MAX_ENV_ENTRY; i++, env++) { 
     656+               if (env->name) { 
     657+                       local_envp[i].name = env->name; 
     658+                       local_envp[i].val = env->val; 
     659+               } else { 
     660+                       local_envp[i].name = NULL; 
     661+                       local_envp[i].val = NULL; 
     662+               } 
     663+       } 
     664+ 
    648665+       set_io_port_base(0); 
    649666+ 
     
    654671+       return 0; 
    655672+} 
    656 diff -ruN linux_2_4_30/arch/mips/ar7/irq.c linux/arch/mips/ar7/irq.c 
    657 --- linux_2_4_30/arch/mips/ar7/irq.c    1970-01-01 00:00:00.000000000 +0000 
    658 +++ linux/arch/mips/ar7/irq.c   2005-06-11 10:54:13.000000000 +0000 
     673diff -urN linux-2.4.30/arch/mips/ar7/irq.c linux-2.4.30.dev/arch/mips/ar7/irq.c 
     674--- linux-2.4.30/arch/mips/ar7/irq.c    1970-01-01 01:00:00.000000000 +0100 
     675+++ linux-2.4.30.dev/arch/mips/ar7/irq.c        2005-06-14 15:36:59.000000000 +0200 
    659676@@ -0,0 +1,669 @@ 
    660677+/* 
     
    13271344+} 
    13281345+ 
    1329 diff -ruN linux_2_4_30/arch/mips/ar7/memory.c linux/arch/mips/ar7/memory.c 
    1330 --- linux_2_4_30/arch/mips/ar7/memory.c 1970-01-01 00:00:00.000000000 +0000 
    1331 +++ linux/arch/mips/ar7/memory.c        2005-06-11 10:43:59.000000000 +0000 
     1346diff -urN linux-2.4.30/arch/mips/ar7/memory.c linux-2.4.30.dev/arch/mips/ar7/memory.c 
     1347--- linux-2.4.30/arch/mips/ar7/memory.c 1970-01-01 01:00:00.000000000 +0100 
     1348+++ linux-2.4.30.dev/arch/mips/ar7/memory.c     2005-06-14 15:36:59.000000000 +0200 
    13321349@@ -0,0 +1,130 @@ 
    13331350+/* 
     
    14611478+       printk("Freeing prom memory: %ldkb freed\n", freed >> 10); 
    14621479+} 
    1463 diff -ruN linux_2_4_30/arch/mips/ar7/mipsIRQ.S linux/arch/mips/ar7/mipsIRQ.S 
    1464 --- linux_2_4_30/arch/mips/ar7/mipsIRQ.S        1970-01-01 00:00:00.000000000 +0000 
    1465 +++ linux/arch/mips/ar7/mipsIRQ.S       2005-06-11 08:30:52.000000000 +0000 
     1480diff -urN linux-2.4.30/arch/mips/ar7/mipsIRQ.S linux-2.4.30.dev/arch/mips/ar7/mipsIRQ.S 
     1481--- linux-2.4.30/arch/mips/ar7/mipsIRQ.S        1970-01-01 01:00:00.000000000 +0100 
     1482+++ linux-2.4.30.dev/arch/mips/ar7/mipsIRQ.S    2005-06-14 15:36:59.000000000 +0200 
    14661483@@ -0,0 +1,120 @@ 
    14671484+/* 
     
    15851602+       nop 
    15861603+END(mipsIRQ) 
    1587 diff -ruN linux_2_4_30/arch/mips/ar7/printf.c linux/arch/mips/ar7/printf.c 
    1588 --- linux_2_4_30/arch/mips/ar7/printf.c 1970-01-01 00:00:00.000000000 +0000 
    1589 +++ linux/arch/mips/ar7/printf.c        2005-06-11 10:43:59.000000000 +0000 
     1604diff -urN linux-2.4.30/arch/mips/ar7/printf.c linux-2.4.30.dev/arch/mips/ar7/printf.c 
     1605--- linux-2.4.30/arch/mips/ar7/printf.c 1970-01-01 01:00:00.000000000 +0100 
     1606+++ linux-2.4.30.dev/arch/mips/ar7/printf.c     2005-06-14 15:36:59.000000000 +0200 
    15901607@@ -0,0 +1,51 @@ 
    15911608+/* 
     
    16401657+ 
    16411658+} 
    1642 diff -ruN linux_2_4_30/arch/mips/ar7/reset.c linux/arch/mips/ar7/reset.c 
    1643 --- linux_2_4_30/arch/mips/ar7/reset.c  1970-01-01 00:00:00.000000000 +0000 
    1644 +++ linux/arch/mips/ar7/reset.c 2005-06-11 10:43:59.000000000 +0000 
     1659diff -urN linux-2.4.30/arch/mips/ar7/reset.c linux-2.4.30.dev/arch/mips/ar7/reset.c 
     1660--- linux-2.4.30/arch/mips/ar7/reset.c  1970-01-01 01:00:00.000000000 +0100 
     1661+++ linux-2.4.30.dev/arch/mips/ar7/reset.c      2005-06-14 15:36:59.000000000 +0200 
    16451662@@ -0,0 +1,54 @@ 
    16461663+/* 
     
    16981715+       _machine_power_off = ar7_machine_power_off; 
    16991716+} 
    1700 diff -ruN linux_2_4_30/arch/mips/ar7/setup.c linux/arch/mips/ar7/setup.c 
    1701 --- linux_2_4_30/arch/mips/ar7/setup.c  1970-01-01 00:00:00.000000000 +0000 
    1702 +++ linux/arch/mips/ar7/setup.c 2005-06-12 08:53:26.000000000 +0000 
     1717diff -urN linux-2.4.30/arch/mips/ar7/setup.c linux-2.4.30.dev/arch/mips/ar7/setup.c 
     1718--- linux-2.4.30/arch/mips/ar7/setup.c  1970-01-01 01:00:00.000000000 +0100 
     1719+++ linux-2.4.30.dev/arch/mips/ar7/setup.c      2005-06-14 15:36:59.000000000 +0200 
    17031720@@ -0,0 +1,150 @@ 
    17041721+/* 
     
    18521869+       board_timer_setup = ar7_timer_setup; 
    18531870+} 
    1854 diff -ruN linux_2_4_30/arch/mips/ar7/time.c linux/arch/mips/ar7/time.c 
    1855 --- linux_2_4_30/arch/mips/ar7/time.c   1970-01-01 00:00:00.000000000 +0000 
    1856 +++ linux/arch/mips/ar7/time.c  2005-06-11 11:53:22.000000000 +0000 
     1871diff -urN linux-2.4.30/arch/mips/ar7/time.c linux-2.4.30.dev/arch/mips/ar7/time.c 
     1872--- linux-2.4.30/arch/mips/ar7/time.c   1970-01-01 01:00:00.000000000 +0100 
     1873+++ linux-2.4.30.dev/arch/mips/ar7/time.c       2005-06-14 15:36:59.000000000 +0200 
    18571874@@ -0,0 +1,125 @@ 
    18581875+/* 
     
    19811998+       set_c0_status(ALLINTS); 
    19821999+} 
    1983 diff -ruN linux_2_4_30/arch/mips/ar7/tnetd73xx_misc.c linux/arch/mips/ar7/tnetd73xx_misc.c 
    1984 --- linux_2_4_30/arch/mips/ar7/tnetd73xx_misc.c 1970-01-01 00:00:00.000000000 +0000 
    1985 +++ linux/arch/mips/ar7/tnetd73xx_misc.c        2005-06-11 10:43:59.000000000 +0000 
     2000diff -urN linux-2.4.30/arch/mips/ar7/tnetd73xx_misc.c linux-2.4.30.dev/arch/mips/ar7/tnetd73xx_misc.c 
     2001--- linux-2.4.30/arch/mips/ar7/tnetd73xx_misc.c 1970-01-01 01:00:00.000000000 +0100 
     2002+++ linux-2.4.30.dev/arch/mips/ar7/tnetd73xx_misc.c     2005-06-14 15:36:59.000000000 +0200 
    19862003@@ -0,0 +1,924 @@ 
    19872004+/****************************************************************************** 
     
    29092926+} 
    29102927+ 
    2911 diff -ruN linux_2_4_30/arch/mips/config-shared.in linux/arch/mips/config-shared.in 
    2912 --- linux_2_4_30/arch/mips/config-shared.in     2005-05-22 18:24:01.000000000 +0000 
    2913 +++ linux/arch/mips/config-shared.in    2005-06-12 10:34:41.000000000 +0000 
     2928diff -urN linux-2.4.30/arch/mips/config-shared.in linux-2.4.30.dev/arch/mips/config-shared.in 
     2929--- linux-2.4.30/arch/mips/config-shared.in     2005-06-14 18:42:06.000000000 +0200 
     2930+++ linux-2.4.30.dev/arch/mips/config-shared.in 2005-06-14 15:36:59.000000000 +0200 
    29142931@@ -20,6 +20,15 @@ 
    29152932 mainmenu_option next_comment 
     
    29562973      "$CONFIG_DECSTATION" = "y" -o \ 
    29572974      "$CONFIG_IBM_WORKPAD" = "y" -o \ 
    2958 diff -ruN linux_2_4_30/arch/mips/kernel/irq.c linux/arch/mips/kernel/irq.c 
    2959 --- linux_2_4_30/arch/mips/kernel/irq.c 2005-05-22 18:24:12.000000000 +0000 
    2960 +++ linux/arch/mips/kernel/irq.c        2005-06-11 11:02:36.000000000 +0000 
     2975diff -urN linux-2.4.30/arch/mips/kernel/irq.c linux-2.4.30.dev/arch/mips/kernel/irq.c 
     2976--- linux-2.4.30/arch/mips/kernel/irq.c 2005-06-14 18:42:06.000000000 +0200 
     2977+++ linux-2.4.30.dev/arch/mips/kernel/irq.c     2005-06-14 15:36:59.000000000 +0200 
    29612978@@ -76,6 +76,7 @@ 
    29622979  * Generic, controller-independent functions: 
     
    30073024 /* 
    30083025  * IRQ autodetection code.. 
    3009 diff -ruN linux_2_4_30/arch/mips/kernel/setup.c linux/arch/mips/kernel/setup.c 
    3010 --- linux_2_4_30/arch/mips/kernel/setup.c       2005-05-22 18:24:12.000000000 +0000 
    3011 +++ linux/arch/mips/kernel/setup.c      2005-06-12 10:37:51.000000000 +0000 
     3026diff -urN linux-2.4.30/arch/mips/kernel/setup.c linux-2.4.30.dev/arch/mips/kernel/setup.c 
     3027--- linux-2.4.30/arch/mips/kernel/setup.c       2005-06-14 18:42:06.000000000 +0200 
     3028+++ linux-2.4.30.dev/arch/mips/kernel/setup.c   2005-06-14 15:36:59.000000000 +0200 
    30123029@@ -109,6 +109,7 @@ 
    30133030 unsigned long isa_slot_offset; 
     
    30573074                panic("Unsupported architecture"); 
    30583075        } 
    3059 diff -ruN linux_2_4_30/arch/mips/kernel/traps.c linux/arch/mips/kernel/traps.c 
    3060 --- linux_2_4_30/arch/mips/kernel/traps.c       2005-05-22 18:24:13.000000000 +0000 
    3061 +++ linux/arch/mips/kernel/traps.c      2005-06-12 11:07:11.000000000 +0000 
     3076diff -urN linux-2.4.30/arch/mips/kernel/traps.c linux-2.4.30.dev/arch/mips/kernel/traps.c 
     3077--- linux-2.4.30/arch/mips/kernel/traps.c       2005-06-14 18:42:06.000000000 +0200 
     3078+++ linux-2.4.30.dev/arch/mips/kernel/traps.c   2005-06-14 15:36:59.000000000 +0200 
    30623079@@ -40,6 +40,10 @@ 
    30633080 #include <asm/uaccess.h> 
     
    31773194        per_cpu_trap_init(); 
    31783195 } 
    3179 diff -ruN linux_2_4_30/arch/mips/lib/promlib.c linux/arch/mips/lib/promlib.c 
    3180 --- linux_2_4_30/arch/mips/lib/promlib.c        2005-05-22 18:24:14.000000000 +0000 
    3181 +++ linux/arch/mips/lib/promlib.c       2005-06-12 09:16:23.000000000 +0000 
     3196diff -urN linux-2.4.30/arch/mips/lib/promlib.c linux-2.4.30.dev/arch/mips/lib/promlib.c 
     3197--- linux-2.4.30/arch/mips/lib/promlib.c        2005-06-14 18:42:06.000000000 +0200 
     3198+++ linux-2.4.30.dev/arch/mips/lib/promlib.c    2005-06-14 15:36:59.000000000 +0200 
    31823199@@ -1,3 +1,4 @@ 
    31833200+#ifndef CONFIG_AR7 
     
    31903207 } 
    31913208+#endif 
    3192 diff -ruN linux_2_4_30/arch/mips/mm/init.c linux/arch/mips/mm/init.c 
    3193 --- linux_2_4_30/arch/mips/mm/init.c    2005-05-22 18:24:17.000000000 +0000 
    3194 +++ linux/arch/mips/mm/init.c   2005-06-12 10:33:49.000000000 +0000 
     3209diff -urN linux-2.4.30/arch/mips/mm/init.c linux-2.4.30.dev/arch/mips/mm/init.c 
     3210--- linux-2.4.30/arch/mips/mm/init.c    2005-06-14 18:42:06.000000000 +0200 
     3211+++ linux-2.4.30.dev/arch/mips/mm/init.c        2005-06-14 15:36:59.000000000 +0200 
    31953212@@ -40,8 +40,10 @@ 
    31963213  
     
    32593276 } 
    32603277+#endif 
    3261 diff -ruN linux_2_4_30/arch/mips/mm/tlb-r4k.c linux/arch/mips/mm/tlb-r4k.c 
    3262 --- linux_2_4_30/arch/mips/mm/tlb-r4k.c 2005-05-22 18:24:17.000000000 +0000 
    3263 +++ linux/arch/mips/mm/tlb-r4k.c        2005-06-12 11:07:31.000000000 +0000 
     3278diff -urN linux-2.4.30/arch/mips/mm/tlb-r4k.c linux-2.4.30.dev/arch/mips/mm/tlb-r4k.c 
     3279--- linux-2.4.30/arch/mips/mm/tlb-r4k.c 2005-06-14 18:42:06.000000000 +0200 
     3280+++ linux-2.4.30.dev/arch/mips/mm/tlb-r4k.c     2005-06-14 15:36:59.000000000 +0200 
    32643281@@ -20,6 +20,10 @@ 
    32653282 #include <asm/pgtable.h> 
     
    32863303        } 
    32873304 } 
    3288 diff -ruN linux_2_4_30/drivers/char/serial.c linux/drivers/char/serial.c 
    3289 --- linux_2_4_30/drivers/char/serial.c  2005-05-22 18:25:22.000000000 +0000 
    3290 +++ linux/drivers/char/serial.c 2005-06-11 17:39:00.000000000 +0000 
     3305diff -urN linux-2.4.30/drivers/char/serial.c linux-2.4.30.dev/drivers/char/serial.c 
     3306--- linux-2.4.30/drivers/char/serial.c  2005-06-14 18:42:06.000000000 +0200 
     3307+++ linux-2.4.30.dev/drivers/char/serial.c      2005-06-14 15:36:59.000000000 +0200 
    32913308@@ -419,7 +419,40 @@ 
    32923309        return 0; 
     
    33853402 #if defined(__powerpc__) || defined(__alpha__) 
    33863403        cval >>= 8; 
    3387 diff -ruN linux_2_4_30/include/asm-mips/ar7/ar7.h linux/include/asm-mips/ar7/ar7.h 
    3388 --- linux_2_4_30/include/asm-mips/ar7/ar7.h     1970-01-01 00:00:00.000000000 +0000 
    3389 +++ linux/include/asm-mips/ar7/ar7.h    2005-06-12 11:08:12.000000000 +0000 
     3404diff -urN linux-2.4.30/include/asm-mips/ar7/ar7.h linux-2.4.30.dev/include/asm-mips/ar7/ar7.h 
     3405--- linux-2.4.30/include/asm-mips/ar7/ar7.h     1970-01-01 01:00:00.000000000 +0100 
     3406+++ linux-2.4.30.dev/include/asm-mips/ar7/ar7.h 2005-06-14 15:36:59.000000000 +0200 
    33903407@@ -0,0 +1,137 @@ 
    33913408+#ifndef _MIPS_AR7_H 
     
    35263543+ 
    35273544+#endif /*_MIPS_AR7_H */ 
    3528 diff -ruN linux_2_4_30/include/asm-mips/ar7/avalanche.h linux/include/asm-mips/ar7/avalanche.h 
    3529 --- linux_2_4_30/include/asm-mips/ar7/avalanche.h       1970-01-01 00:00:00.000000000 +0000 
    3530 +++ linux/include/asm-mips/ar7/avalanche.h      2005-06-11 07:48:48.000000000 +0000 
     3545diff -urN linux-2.4.30/include/asm-mips/ar7/avalanche.h linux-2.4.30.dev/include/asm-mips/ar7/avalanche.h 
     3546--- linux-2.4.30/include/asm-mips/ar7/avalanche.h       1970-01-01 01:00:00.000000000 +0100 
     3547+++ linux-2.4.30.dev/include/asm-mips/ar7/avalanche.h   2005-06-14 15:36:59.000000000 +0200 
    35313548@@ -0,0 +1,183 @@ 
    35323549+/* $Id$ 
     
    37133730+ 
    37143731+ 
    3715 diff -ruN linux_2_4_30/include/asm-mips/ar7/avalanche_int.h linux/include/asm-mips/ar7/avalanche_int.h 
    3716 --- linux_2_4_30/include/asm-mips/ar7/avalanche_int.h   1970-01-01 00:00:00.000000000 +0000 
    3717 +++ linux/include/asm-mips/ar7/avalanche_int.h  2005-06-11 07:48:48.000000000 +0000 
     3732diff -urN linux-2.4.30/include/asm-mips/ar7/avalanche_int.h linux-2.4.30.dev/include/asm-mips/ar7/avalanche_int.h 
     3733--- linux-2.4.30/include/asm-mips/ar7/avalanche_int.h   1970-01-01 01:00:00.000000000 +0100 
     3734+++ linux-2.4.30.dev/include/asm-mips/ar7/avalanche_int.h       2005-06-14 15:36:59.000000000 +0200 
    37183735@@ -0,0 +1,298 @@ 
    37193736+/* $Id$ 
     
    40154032+ 
    40164033+ 
    4017 diff -ruN linux_2_4_30/include/asm-mips/ar7/avalanche_intc.h linux/include/asm-mips/ar7/avalanche_intc.h 
    4018 --- linux_2_4_30/include/asm-mips/ar7/avalanche_intc.h  1970-01-01 00:00:00.000000000 +0000 
    4019 +++ linux/include/asm-mips/ar7/avalanche_intc.h 2005-06-11 07:48:48.000000000 +0000 
     4034diff -urN linux-2.4.30/include/asm-mips/ar7/avalanche_intc.h linux-2.4.30.dev/include/asm-mips/ar7/avalanche_intc.h 
     4035--- linux-2.4.30/include/asm-mips/ar7/avalanche_intc.h  1970-01-01 01:00:00.000000000 +0100 
     4036+++ linux-2.4.30.dev/include/asm-mips/ar7/avalanche_intc.h      2005-06-14 15:36:59.000000000 +0200 
    40204037@@ -0,0 +1,273 @@ 
    40214038+ /* 
     
    42924309+ 
    42934310+#endif /* _AVALANCHE_INTC_H */ 
    4294 diff -ruN linux_2_4_30/include/asm-mips/ar7/avalanche_prom.h linux/include/asm-mips/ar7/avalanche_prom.h 
    4295 --- linux_2_4_30/include/asm-mips/ar7/avalanche_prom.h  1970-01-01 00:00:00.000000000 +0000 
    4296 +++ linux/include/asm-mips/ar7/avalanche_prom.h 2005-06-11 07:48:48.000000000 +0000 
     4311diff -urN linux-2.4.30/include/asm-mips/ar7/avalanche_prom.h linux-2.4.30.dev/include/asm-mips/ar7/avalanche_prom.h 
     4312--- linux-2.4.30/include/asm-mips/ar7/avalanche_prom.h  1970-01-01 01:00:00.000000000 +0100 
     4313+++ linux-2.4.30.dev/include/asm-mips/ar7/avalanche_prom.h      2005-06-14 15:36:59.000000000 +0200 
    42974314@@ -0,0 +1,54 @@ 
    42984315+/* $Id$ 
     
    43504367+#endif /* !(_MIPS_PROM_H) */ 
    43514368+ 
    4352 diff -ruN linux_2_4_30/include/asm-mips/ar7/avalanche_regs.h linux/include/asm-mips/ar7/avalanche_regs.h 
    4353 --- linux_2_4_30/include/asm-mips/ar7/avalanche_regs.h  1970-01-01 00:00:00.000000000 +0000 
    4354 +++ linux/include/asm-mips/ar7/avalanche_regs.h 2005-06-11 07:48:48.000000000 +0000 
     4369diff -urN linux-2.4.30/include/asm-mips/ar7/avalanche_regs.h linux-2.4.30.dev/include/asm-mips/ar7/avalanche_regs.h 
     4370--- linux-2.4.30/include/asm-mips/ar7/avalanche_regs.h  1970-01-01 01:00:00.000000000 +0100 
     4371+++ linux-2.4.30.dev/include/asm-mips/ar7/avalanche_regs.h      2005-06-14 15:36:59.000000000 +0200 
    43554372@@ -0,0 +1,567 @@ 
    43564373+/*  
     
    49214938+ 
    49224939+ 
    4923 diff -ruN linux_2_4_30/include/asm-mips/ar7/tnetd73xx.h linux/include/asm-mips/ar7/tnetd73xx.h 
    4924 --- linux_2_4_30/include/asm-mips/ar7/tnetd73xx.h       1970-01-01 00:00:00.000000000 +0000 
    4925 +++ linux/include/asm-mips/ar7/tnetd73xx.h      2005-06-12 10:28:19.000000000 +0000 
     4940diff -urN linux-2.4.30/include/asm-mips/ar7/tnetd73xx.h linux-2.4.30.dev/include/asm-mips/ar7/tnetd73xx.h 
     4941--- linux-2.4.30/include/asm-mips/ar7/tnetd73xx.h       1970-01-01 01:00:00.000000000 +0100 
     4942+++ linux-2.4.30.dev/include/asm-mips/ar7/tnetd73xx.h   2005-06-14 15:36:59.000000000 +0200 
    49264943@@ -0,0 +1,340 @@ 
    49274944+/****************************************************************************** 
     
    52655282+ 
    52665283+#endif /* __TNETD73XX_H_ */ 
    5267 diff -ruN linux_2_4_30/include/asm-mips/ar7/tnetd73xx_err.h linux/include/asm-mips/ar7/tnetd73xx_err.h 
    5268 --- linux_2_4_30/include/asm-mips/ar7/tnetd73xx_err.h   1970-01-01 00:00:00.000000000 +0000 
    5269 +++ linux/include/asm-mips/ar7/tnetd73xx_err.h  2005-06-11 07:48:48.000000000 +0000 
     5284diff -urN linux-2.4.30/include/asm-mips/ar7/tnetd73xx_err.h linux-2.4.30.dev/include/asm-mips/ar7/tnetd73xx_err.h 
     5285--- linux-2.4.30/include/asm-mips/ar7/tnetd73xx_err.h   1970-01-01 01:00:00.000000000 +0100 
     5286+++ linux-2.4.30.dev/include/asm-mips/ar7/tnetd73xx_err.h       2005-06-14 15:36:59.000000000 +0200 
    52705287@@ -0,0 +1,42 @@ 
    52715288+/****************************************************************************** 
     
    53115328+ 
    53125329+#endif /* __TNETD73XX_ERR_H__ */ 
    5313 diff -ruN linux_2_4_30/include/asm-mips/ar7/tnetd73xx_misc.h linux/include/asm-mips/ar7/tnetd73xx_misc.h 
    5314 --- linux_2_4_30/include/asm-mips/ar7/tnetd73xx_misc.h  1970-01-01 00:00:00.000000000 +0000 
    5315 +++ linux/include/asm-mips/ar7/tnetd73xx_misc.h 2005-06-12 10:29:31.000000000 +0000 
     5330diff -urN linux-2.4.30/include/asm-mips/ar7/tnetd73xx_misc.h linux-2.4.30.dev/include/asm-mips/ar7/tnetd73xx_misc.h 
     5331--- linux-2.4.30/include/asm-mips/ar7/tnetd73xx_misc.h  1970-01-01 01:00:00.000000000 +0100 
     5332+++ linux-2.4.30.dev/include/asm-mips/ar7/tnetd73xx_misc.h      2005-06-14 15:36:59.000000000 +0200 
    53165333@@ -0,0 +1,243 @@ 
    53175334+/****************************************************************************** 
     
    55585575+ 
    55595576+#endif /* __TNETD73XX_MISC_H__ */ 
    5560 diff -ruN linux_2_4_30/include/asm-mips/io.h linux/include/asm-mips/io.h 
    5561 --- linux_2_4_30/include/asm-mips/io.h  2005-05-22 18:27:58.000000000 +0000 
    5562 +++ linux/include/asm-mips/io.h 2005-06-12 11:08:22.000000000 +0000 
     5577diff -urN linux-2.4.30/include/asm-mips/io.h linux-2.4.30.dev/include/asm-mips/io.h 
     5578--- linux-2.4.30/include/asm-mips/io.h  2005-06-14 18:42:07.000000000 +0200 
     5579+++ linux-2.4.30.dev/include/asm-mips/io.h      2005-06-14 15:36:59.000000000 +0200 
    55635580@@ -63,8 +63,12 @@ 
    55645581 #ifdef CONFIG_64BIT_PHYS_ADDR 
     
    55745591 #define IO_SPACE_LIMIT 0xffff 
    55755592  
    5576 diff -ruN linux_2_4_30/include/asm-mips/irq.h linux/include/asm-mips/irq.h 
    5577 --- linux_2_4_30/include/asm-mips/irq.h 2005-05-22 18:27:58.000000000 +0000 
    5578 +++ linux/include/asm-mips/irq.h        2005-06-12 10:22:33.000000000 +0000 
     5593diff -urN linux-2.4.30/include/asm-mips/irq.h linux-2.4.30.dev/include/asm-mips/irq.h 
     5594--- linux-2.4.30/include/asm-mips/irq.h 2005-06-14 18:42:07.000000000 +0200 
     5595+++ linux-2.4.30.dev/include/asm-mips/irq.h     2005-06-14 15:36:59.000000000 +0200 
    55795596@@ -14,7 +14,12 @@ 
    55805597 #include <linux/config.h> 
     
    55905607 #ifdef CONFIG_I8259 
    55915608 static inline int irq_cannonicalize(int irq) 
    5592 diff -ruN linux_2_4_30/include/asm-mips/page.h linux/include/asm-mips/page.h 
    5593 --- linux_2_4_30/include/asm-mips/page.h        2005-05-22 18:27:59.000000000 +0000 
    5594 +++ linux/include/asm-mips/page.h       2005-06-12 10:39:06.000000000 +0000 
     5609diff -urN linux-2.4.30/include/asm-mips/page.h linux-2.4.30.dev/include/asm-mips/page.h 
     5610--- linux-2.4.30/include/asm-mips/page.h        2005-06-14 18:42:07.000000000 +0200 
     5611+++ linux-2.4.30.dev/include/asm-mips/page.h    2005-06-14 15:36:59.000000000 +0200 
    55955612@@ -129,7 +129,11 @@ 
    55965613  
     
    56055622  
    56065623 #define VM_DATA_DEFAULT_FLAGS  (VM_READ | VM_WRITE | VM_EXEC | \ 
    5607 diff -ruN linux_2_4_30/include/asm-mips/pgtable-32.h linux/include/asm-mips/pgtable-32.h 
    5608 --- linux_2_4_30/include/asm-mips/pgtable-32.h  2005-05-22 18:27:59.000000000 +0000 
    5609 +++ linux/include/asm-mips/pgtable-32.h 2005-06-12 10:39:06.000000000 +0000 
     5624diff -urN linux-2.4.30/include/asm-mips/pgtable-32.h linux-2.4.30.dev/include/asm-mips/pgtable-32.h 
     5625--- linux-2.4.30/include/asm-mips/pgtable-32.h  2005-06-14 18:42:07.000000000 +0200 
     5626+++ linux-2.4.30.dev/include/asm-mips/pgtable-32.h      2005-06-14 15:36:59.000000000 +0200 
    56105627@@ -108,7 +108,18 @@ 
    56115628  * and a page entry and page directory to the page they refer to. 
     
    56485665 #define __mk_pte(page_nr,pgprot) __pte(((page_nr) << (PAGE_SHIFT+2)) | pgprot_val(pgprot)) 
    56495666 #else 
    5650 diff -ruN linux_2_4_30/include/asm-mips/serial.h linux/include/asm-mips/serial.h 
    5651 --- linux_2_4_30/include/asm-mips/serial.h      2005-05-22 18:28:00.000000000 +0000 
    5652 +++ linux/include/asm-mips/serial.h     2005-06-12 11:08:39.000000000 +0000 
     5667diff -urN linux-2.4.30/include/asm-mips/serial.h linux-2.4.30.dev/include/asm-mips/serial.h 
     5668--- linux-2.4.30/include/asm-mips/serial.h      2005-06-14 18:42:07.000000000 +0200 
     5669+++ linux-2.4.30.dev/include/asm-mips/serial.h  2005-06-14 15:36:59.000000000 +0200 
    56535670@@ -65,6 +65,15 @@ 
    56545671  
Note: See TracChangeset for help on using the changeset viewer.