Changeset 347

Timestamp:

04/21/08 02:46:45 (8 months ago)

Author:

gentux2

Message:

Adjustments to linux headers and lib32 for compiling resync 1.0.4

Location:

GPL/trunk

Files:

• include/asm/page.h (modified) (4 diffs)
• include/linux/config.h (modified) (1 diff)
• include/linux/mm.h (modified) (2 diffs)
• include/linux/vmalloc.h (modified) (1 diff)
• lib32/misc.c (modified) (1 diff)

GPL/trunk/include/asm/page.h

@@ -1 @@
-/* $Id: page.h,v 1.1.1.1 2003/07/02 13:56:58 eleph Exp $ */
 
 #ifndef _I386_PAGE_H
@@ -35 +34 @@
 #endif
 
-typedef struct { unsigned long pgprot; } pgprot_t;
+typedef struct { unsigned long long pgprot; } pgprot_t;
 
 #define pte_val(x)      ((x).pte)
@@ -42 +41 @@
 #define pgprot_val(x)   ((x).pgprot)
 
-#define __pgprot(x)     ((pgprot_t) { (x) } )
+pgprot_t __pgprot(int x);
 
 #endif /* !__ASSEMBLY__ */
@@ -69 +68 @@
 #define MAP_NR(addr)            (__pa(addr) >> PAGE_SHIFT)
 #define PHYSMAP_NR(addr)        ((unsigned long)(addr) >> PAGE_SHIFT)
+#ifndef virt_to_page
+#define virt_to_page(x) (&mem_map[MAP_NR(x)])
+#endif
 
 #endif /* __KERNEL__ */

GPL/trunk/include/linux/config.h

@@ -1 @@
-/* $Id: config.h,v 1.1.1.1 2003/07/02 13:57:00 eleph Exp $ */
 
 #ifndef _LINUX_CONFIG_H
 #define _LINUX_CONFIG_H
 
+/* __user not supported in OpenWatcom */
+#ifndef __user
+#define __user
 #endif
+
+#endif /* _LINUX_CONFIG_H */

GPL/trunk/include/linux/mm.h

@@ -135 +135 @@
 extern unsigned long virt_to_phys(void * address);
 
-extern mem_map_t *virt_to_page(int x);
-
 extern void * phys_to_virt(unsigned long address);
 
@@ -161 +159 @@
         void (*open)(struct vm_area_struct * area);
         void (*close)(struct vm_area_struct * area);
-        void (*unmap)(struct vm_area_struct *area, unsigned long, size_t);
-        void (*protect)(struct vm_area_struct *area, unsigned long, size_t, unsigned int newprot);
-        int (*sync)(struct vm_area_struct *area, unsigned long, size_t, unsigned int flags);
-        void (*advise)(struct vm_area_struct *area, unsigned long, size_t, unsigned int advise);
         struct page * (*nopage)(struct vm_area_struct * area, unsigned long address, int write_access);
         struct page * (*wppage)(struct vm_area_struct * area, unsigned long address, struct page * page);

GPL/trunk/include/linux/vmalloc.h

@@ -6 +6 @@
 
 //#include <asm/pgtable.h>
+
+/* bits in vm_struct->flags */
+#define VM_IOREMAP      0x00000001      /* ioremap() and friends */
+#define VM_ALLOC        0x00000002      /* vmalloc() */
+#define VM_MAP          0x00000004      /* vmap()ed pages */
+#define VM_USERMAP      0x00000008      /* suitable for remap_vmalloc_range */
+#define VM_VPAGES       0x00000010      /* buffer for pages was vmalloc'ed */
+/* bits [20..32] reserved for arch specific ioremap internals */
 
 struct vm_struct {

GPL/trunk/lib32/misc.c

@@ -120 +120 @@
 //******************************************************************************
 //******************************************************************************
-mem_map_t *virt_to_page(int x)
-{
-    static mem_map_t map = {0};
-    return ↦
+pgprot_t __pgprot(int x)
+{
+        unsigned long long cast_x;
+        pgprot_t pg;
+        cast_x = (unsigned long long) (x);
+        pg.pgprot = cast_x;
+        return (pg);
 }
 //******************************************************************************