Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/linux-libc-headers/patches/linux-2.6.19-mips_headers-1.patch

    Contents of /trunk/linux-libc-headers/patches/linux-2.6.19-mips_headers-1.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 435 - (show annotations) (download)
    Fri Mar 16 00:06:55 2007 UTC (17 years, 1 month ago) by niro
    File size: 9520 byte(s) 
    updated to upstream svn-149
    1 diff -Naur linux-2.6.19/include/asm-mips/compat.h linux-mips-2.6.19/include/asm-mips/compat.h
    2 --- linux-2.6.19/include/asm-mips/compat.h 2006-11-29 13:57:37.000000000 -0800
    3 +++ linux-mips-2.6.19/include/asm-mips/compat.h 2006-11-29 15:23:09.000000000 -0800
    4 @@ -32,6 +32,7 @@
    5 s32 val[2];
    6 } compat_fsid_t;
    7 typedef s32 compat_timer_t;
    8 +typedef s32 compat_key_t;
    9
    10 typedef s32 compat_int_t;
    11 typedef s32 compat_long_t;
    12 @@ -146,4 +147,71 @@
    13 return (void __user *) (regs->regs[29] - len);
    14 }
    15
    16 +struct compat_ipc64_perm {
    17 + compat_key_t key;
    18 + __compat_uid32_t uid;
    19 + __compat_gid32_t gid;
    20 + __compat_uid32_t cuid;
    21 + __compat_gid32_t cgid;
    22 + compat_mode_t mode;
    23 + unsigned short seq;
    24 + unsigned short __pad2;
    25 + compat_ulong_t __unused1;
    26 + compat_ulong_t __unused2;
    27 +};
    28 +
    29 +struct compat_semid64_ds {
    30 + struct compat_ipc64_perm sem_perm;
    31 + compat_time_t sem_otime;
    32 + compat_time_t sem_ctime;
    33 + compat_ulong_t sem_nsems;
    34 + compat_ulong_t __unused1;
    35 + compat_ulong_t __unused2;
    36 +};
    37 +
    38 +struct compat_msqid64_ds {
    39 + struct compat_ipc64_perm msg_perm;
    40 +#ifndef CONFIG_CPU_LITTLE_ENDIAN
    41 + compat_ulong_t __unused1;
    42 +#endif
    43 + compat_time_t msg_stime;
    44 +#ifdef CONFIG_CPU_LITTLE_ENDIAN
    45 + compat_ulong_t __unused1;
    46 +#endif
    47 +#ifndef CONFIG_CPU_LITTLE_ENDIAN
    48 + compat_ulong_t __unused2;
    49 +#endif
    50 + compat_time_t msg_rtime;
    51 +#ifdef CONFIG_CPU_LITTLE_ENDIAN
    52 + compat_ulong_t __unused2;
    53 +#endif
    54 +#ifndef CONFIG_CPU_LITTLE_ENDIAN
    55 + compat_ulong_t __unused3;
    56 +#endif
    57 + compat_time_t msg_ctime;
    58 +#ifdef CONFIG_CPU_LITTLE_ENDIAN
    59 + compat_ulong_t __unused3;
    60 +#endif
    61 + compat_ulong_t msg_cbytes;
    62 + compat_ulong_t msg_qnum;
    63 + compat_ulong_t msg_qbytes;
    64 + compat_pid_t msg_lspid;
    65 + compat_pid_t msg_lrpid;
    66 + compat_ulong_t __unused4;
    67 + compat_ulong_t __unused5;
    68 +};
    69 +
    70 +struct compat_shmid64_ds {
    71 + struct compat_ipc64_perm shm_perm;
    72 + compat_size_t shm_segsz;
    73 + compat_time_t shm_atime;
    74 + compat_time_t shm_dtime;
    75 + compat_time_t shm_ctime;
    76 + compat_pid_t shm_cpid;
    77 + compat_pid_t shm_lpid;
    78 + compat_ulong_t shm_nattch;
    79 + compat_ulong_t __unused1;
    80 + compat_ulong_t __unused2;
    81 +};
    82 +
    83 #endif /* _ASM_COMPAT_H */
    84 diff -Naur linux-2.6.19/include/asm-mips/io.h linux-mips-2.6.19/include/asm-mips/io.h
    85 --- linux-2.6.19/include/asm-mips/io.h 2006-11-29 13:57:37.000000000 -0800
    86 +++ linux-mips-2.6.19/include/asm-mips/io.h 2006-11-29 15:23:09.000000000 -0800
    87 @@ -518,34 +518,6 @@
    88 }
    89
    90 /*
    91 - * Memory Mapped I/O
    92 - */
    93 -#define ioread8(addr) readb(addr)
    94 -#define ioread16(addr) readw(addr)
    95 -#define ioread32(addr) readl(addr)
    96 -
    97 -#define iowrite8(b,addr) writeb(b,addr)
    98 -#define iowrite16(w,addr) writew(w,addr)
    99 -#define iowrite32(l,addr) writel(l,addr)
    100 -
    101 -#define ioread8_rep(a,b,c) readsb(a,b,c)
    102 -#define ioread16_rep(a,b,c) readsw(a,b,c)
    103 -#define ioread32_rep(a,b,c) readsl(a,b,c)
    104 -
    105 -#define iowrite8_rep(a,b,c) writesb(a,b,c)
    106 -#define iowrite16_rep(a,b,c) writesw(a,b,c)
    107 -#define iowrite32_rep(a,b,c) writesl(a,b,c)
    108 -
    109 -/* Create a virtual mapping cookie for an IO port range */
    110 -extern void __iomem *ioport_map(unsigned long port, unsigned int nr);
    111 -extern void ioport_unmap(void __iomem *);
    112 -
    113 -/* Create a virtual mapping cookie for a PCI BAR (memory or IO) */
    114 -struct pci_dev;
    115 -extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);
    116 -extern void pci_iounmap(struct pci_dev *dev, void __iomem *);
    117 -
    118 -/*
    119 * ISA space is 'always mapped' on currently supported MIPS systems, no need
    120 * to explicitly ioremap() it. The fact that the ISA IO space is mapped
    121 * to PAGE_OFFSET is pure coincidence - it does not mean ISA values
    122 diff -Naur linux-2.6.19/include/asm-mips/mach-au1x00/au1000.h linux-mips-2.6.19/include/asm-mips/mach-au1x00/au1000.h
    123 --- linux-2.6.19/include/asm-mips/mach-au1x00/au1000.h 2006-11-29 13:57:37.000000000 -0800
    124 +++ linux-mips-2.6.19/include/asm-mips/mach-au1x00/au1000.h 2006-11-29 15:23:09.000000000 -0800
    125 @@ -39,6 +39,7 @@
    126 #ifndef _LANGUAGE_ASSEMBLY
    127
    128 #include <linux/delay.h>
    129 +#include <linux/types.h>
    130 #include <asm/io.h>
    131
    132 /* cpu pipeline flush */
    133 @@ -1664,12 +1665,12 @@
    134 * addresses. For PCI IO, it's simpler because we get to do the ioremap
    135 * ourselves and then adjust the device's resources.
    136 */
    137 -#define Au1500_EXT_CFG 0x600000000ULL
    138 -#define Au1500_EXT_CFG_TYPE1 0x680000000ULL
    139 -#define Au1500_PCI_IO_START 0x500000000ULL
    140 -#define Au1500_PCI_IO_END 0x5000FFFFFULL
    141 -#define Au1500_PCI_MEM_START 0x440000000ULL
    142 -#define Au1500_PCI_MEM_END 0x44FFFFFFFULL
    143 +#define Au1500_EXT_CFG ((resource_size_t) 0x600000000ULL)
    144 +#define Au1500_EXT_CFG_TYPE1 ((resource_size_t) 0x680000000ULL)
    145 +#define Au1500_PCI_IO_START ((resource_size_t) 0x500000000ULL)
    146 +#define Au1500_PCI_IO_END ((resource_size_t) 0x5000FFFFFULL)
    147 +#define Au1500_PCI_MEM_START ((resource_size_t) 0x440000000ULL)
    148 +#define Au1500_PCI_MEM_END ((resource_size_t) 0x44FFFFFFFULL)
    149
    150 #define PCI_IO_START (Au1500_PCI_IO_START + 0x1000)
    151 #define PCI_IO_END (Au1500_PCI_IO_END)
    152 diff -Naur linux-2.6.19/include/asm-mips/mach-au1x00/au1xxx_ide.h linux-mips-2.6.19/include/asm-mips/mach-au1x00/au1xxx_ide.h
    153 --- linux-2.6.19/include/asm-mips/mach-au1x00/au1xxx_ide.h 2006-11-29 13:57:37.000000000 -0800
    154 +++ linux-mips-2.6.19/include/asm-mips/mach-au1x00/au1xxx_ide.h 2006-11-29 15:23:09.000000000 -0800
    155 @@ -83,6 +83,7 @@
    156 } _auide_hwif;
    157
    158 #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
    159 +
    160 /* HD white list */
    161 static const struct drive_list_entry dma_white_list [] = {
    162 /*
    163 diff -Naur linux-2.6.19/include/asm-mips/page.h linux-mips-2.6.19/include/asm-mips/page.h
    164 --- linux-2.6.19/include/asm-mips/page.h 2006-11-29 13:57:37.000000000 -0800
    165 +++ linux-mips-2.6.19/include/asm-mips/page.h 2006-11-29 15:23:09.000000000 -0800
    166 @@ -59,16 +59,13 @@
    167 flush_data_cache_page((unsigned long)addr);
    168 }
    169
    170 -static inline void copy_user_page(void *vto, void *vfrom, unsigned long vaddr,
    171 - struct page *to)
    172 -{
    173 - extern void (*flush_data_cache_page)(unsigned long addr);
    174 -
    175 - copy_page(vto, vfrom);
    176 - if (!cpu_has_ic_fills_f_dc ||
    177 - pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK))
    178 - flush_data_cache_page((unsigned long)vto);
    179 -}
    180 +extern void copy_user_page(void *vto, void *vfrom, unsigned long vaddr,
    181 + struct page *to);
    182 +struct vm_area_struct;
    183 +extern void copy_user_highpage(struct page *to, struct page *from,
    184 + unsigned long vaddr, struct vm_area_struct *vma);
    185 +
    186 +#define __HAVE_ARCH_COPY_USER_HIGHPAGE
    187
    188 /*
    189 * These are used to make use of C type-checking..
    190 diff -Naur linux-2.6.19/include/linux/highmem.h linux-mips-2.6.19/include/linux/highmem.h
    191 --- linux-2.6.19/include/linux/highmem.h 2006-11-29 13:57:37.000000000 -0800
    192 +++ linux-mips-2.6.19/include/linux/highmem.h 2006-11-29 15:23:09.000000000 -0800
    193 @@ -94,7 +94,10 @@
    194 kunmap_atomic(kaddr, KM_USER0);
    195 }
    196
    197 -static inline void copy_user_highpage(struct page *to, struct page *from, unsigned long vaddr)
    198 +#ifndef __HAVE_ARCH_COPY_USER_HIGHPAGE
    199 +
    200 +static inline void copy_user_highpage(struct page *to, struct page *from,
    201 + unsigned long vaddr, struct vm_area_struct *vma)
    202 {
    203 char *vfrom, *vto;
    204
    205 @@ -107,6 +110,8 @@
    206 smp_wmb();
    207 }
    208
    209 +#endif
    210 +
    211 static inline void copy_highpage(struct page *to, struct page *from)
    212 {
    213 char *vfrom, *vto;
    214 diff -Naur linux-2.6.19/include/linux/pci_ids.h linux-mips-2.6.19/include/linux/pci_ids.h
    215 --- linux-2.6.19/include/linux/pci_ids.h 2006-11-29 13:57:37.000000000 -0800
    216 +++ linux-mips-2.6.19/include/linux/pci_ids.h 2006-11-29 15:23:09.000000000 -0800
    217 @@ -1604,6 +1604,9 @@
    218 #define PCI_VENDOR_ID_SATSAGEM 0x1267
    219 #define PCI_DEVICE_ID_SATSAGEM_NICCY 0x1016
    220
    221 +#define PCI_VENDOR_ID_SILICON_MOTION 0x126f
    222 +#define PCI_DEVICE_ID_SM501_VOYAGER_GX_REV_AA 0x0501
    223 +#define PCI_DEVICE_ID_SM501_VOYAGER_GX_REV_B 0x0510
    224
    225 #define PCI_VENDOR_ID_ENSONIQ 0x1274
    226 #define PCI_DEVICE_ID_ENSONIQ_CT5880 0x5880
    227 diff -Naur linux-2.6.19/include/linux/serial.h linux-mips-2.6.19/include/linux/serial.h
    228 --- linux-2.6.19/include/linux/serial.h 2006-11-29 13:57:37.000000000 -0800
    229 +++ linux-mips-2.6.19/include/linux/serial.h 2006-11-29 15:23:09.000000000 -0800
    230 @@ -76,7 +76,8 @@
    231 #define PORT_16654 11
    232 #define PORT_16850 12
    233 #define PORT_RSA 13 /* RSA-DV II/S card */
    234 -#define PORT_MAX 13
    235 +#define PORT_SB1250 14
    236 +#define PORT_MAX 14
    237
    238 #define SERIAL_IO_PORT 0
    239 #define SERIAL_IO_HUB6 1
    240 diff -Naur linux-2.6.19/include/linux/serial_ip3106.h linux-mips-2.6.19/include/linux/serial_ip3106.h
    241 --- linux-2.6.19/include/linux/serial_ip3106.h 2006-11-29 13:57:37.000000000 -0800
    242 +++ linux-mips-2.6.19/include/linux/serial_ip3106.h 2006-11-29 15:23:09.000000000 -0800
    243 @@ -78,4 +78,16 @@
    244 #define IP3106_UART_FIFO_RXFIFO 0x00001F00
    245 #define IP3106_UART_FIFO_RBRTHR 0x000000FF
    246
    247 +#define ip3106_lcr(base,port) *(volatile u32 *)(base+(port*0x1000) + 0x000)
    248 +#define ip3106_mcr(base, port) *(volatile u32 *)(base+(port*0x1000) + 0x004)
    249 +#define ip3106_baud(base, port) *(volatile u32 *)(base+(port*0x1000) + 0x008)
    250 +#define ip3106_cfg(base, port) *(volatile u32 *)(base+(port*0x1000) + 0x00C)
    251 +#define ip3106_fifo(base, port) *(volatile u32 *)(base+(port*0x1000) + 0x028)
    252 +#define ip3106_istat(base, port) *(volatile u32 *)(base+(port*0x1000) + 0xFE0)
    253 +#define ip3106_ien(base, port) *(volatile u32 *)(base+(port*0x1000) + 0xFE4)
    254 +#define ip3106_iclr(base, port) *(volatile u32 *)(base+(port*0x1000) + 0xFE8)
    255 +#define ip3106_iset(base, port) *(volatile u32 *)(base+(port*0x1000) + 0xFEC)
    256 +#define ip3106_pd(base, port) *(volatile u32 *)(base+(port*0x1000) + 0xFF4)
    257 +#define ip3106_mid(base, port) *(volatile u32 *)(base+(port*0x1000) + 0xFFC)
    258 +
    259 #endif