Changeset 347


Ignore:
Timestamp:
Apr 21, 2008, 2:46:45 AM (17 years ago)
Author:
Brendan Oakley
Message:

Adjustments to linux headers and lib32 for compiling resync 1.0.4

Location:
GPL/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • GPL/trunk/include/asm/page.h

    r32 r347  
    1 /* $Id: page.h,v 1.1.1.1 2003/07/02 13:56:58 eleph Exp $ */
    21
    32#ifndef _I386_PAGE_H
    … …  
    3534#endif
    3635
    37 typedef struct { unsigned long pgprot; } pgprot_t;
     36typedef struct { unsigned long long pgprot; } pgprot_t;
    3837
    3938#define pte_val(x)      ((x).pte)
    … …  
    4241#define pgprot_val(x)   ((x).pgprot)
    4342
    44 #define __pgprot(x)     ((pgprot_t) { (x) } )
     43pgprot_t __pgprot(int x);
    4544
    4645#endif /* !__ASSEMBLY__ */
    … …  
    6968#define MAP_NR(addr)            (__pa(addr) >> PAGE_SHIFT)
    7069#define PHYSMAP_NR(addr)        ((unsigned long)(addr) >> PAGE_SHIFT)
     70#ifndef virt_to_page
     71#define virt_to_page(x) (&mem_map[MAP_NR(x)])
     72#endif
    7173
    7274#endif /* __KERNEL__ */

  • GPL/trunk/include/linux/config.h

    r32 r347  
    1 /* $Id: config.h,v 1.1.1.1 2003/07/02 13:57:00 eleph Exp $ */
    21
    32#ifndef _LINUX_CONFIG_H
    43#define _LINUX_CONFIG_H
    54
     5/* __user not supported in OpenWatcom */
     6#ifndef __user
     7#define __user
    68#endif
     9
     10#endif /* _LINUX_CONFIG_H */

  • GPL/trunk/include/linux/mm.h

    r32 r347  
    135135extern unsigned long virt_to_phys(void * address);
    136136
    137 extern mem_map_t *virt_to_page(int x);
    138 
    139137extern void * phys_to_virt(unsigned long address);
    140138
    … …  
    161159        void (*open)(struct vm_area_struct * area);
    162160        void (*close)(struct vm_area_struct * area);
    163         void (*unmap)(struct vm_area_struct *area, unsigned long, size_t);
    164         void (*protect)(struct vm_area_struct *area, unsigned long, size_t, unsigned int newprot);
    165         int (*sync)(struct vm_area_struct *area, unsigned long, size_t, unsigned int flags);
    166         void (*advise)(struct vm_area_struct *area, unsigned long, size_t, unsigned int advise);
    167161        struct page * (*nopage)(struct vm_area_struct * area, unsigned long address, int write_access);
    168162        struct page * (*wppage)(struct vm_area_struct * area, unsigned long address, struct page * page);

  • GPL/trunk/include/linux/vmalloc.h

    r32 r347  
    66
    77//#include <asm/pgtable.h>
     8
     9/* bits in vm_struct->flags */
     10#define VM_IOREMAP      0x00000001      /* ioremap() and friends */
     11#define VM_ALLOC        0x00000002      /* vmalloc() */
     12#define VM_MAP          0x00000004      /* vmap()ed pages */
     13#define VM_USERMAP      0x00000008      /* suitable for remap_vmalloc_range */
     14#define VM_VPAGES       0x00000010      /* buffer for pages was vmalloc'ed */
     15/* bits [20..32] reserved for arch specific ioremap internals */
    816
    917struct vm_struct {

  • GPL/trunk/lib32/misc.c

    r73 r347  
    120120//******************************************************************************
    121121//******************************************************************************
    122 mem_map_t *virt_to_page(int x)
    123 {
    124     static mem_map_t map = {0};
    125     return &map;
     122pgprot_t __pgprot(int x)
     123{
     124        unsigned long long cast_x;
     125        pgprot_t pg;
     126        cast_x = (unsigned long long) (x);
     127        pg.pgprot = cast_x;
     128        return (pg);
    126129}
    127130//******************************************************************************
Note: See TracChangeset for help on using the changeset viewer.