Changeset 367

Timestamp:

Aug 31, 2008, 12:04:49 AM (17 years ago)

Author:

Brendan Oakley

Message:

Reverse mistake in changeset:1

Location:

GPL

Files:

• branches/alsa-resync1/alsa-kernel/core/sgbuf.c (modified) (1 diff)
• trunk/include/asm/page.h (modified) (2 diffs)
• trunk/lib32/misc.c (modified) (2 diffs)

GPL/branches/alsa-resync1/alsa-kernel/core/sgbuf.c

@@ -129 +129 @@
 
             sgbuf->size = size;
-#ifndef TARGET_OS2
+#ifndef TARGET_OS2 //TODO: implement vmap() and friends
         dmab->area = vmap(sgbuf->page_table, sgbuf->pages, VM_MAP, PAGE_KERNEL);
 #else

GPL/trunk/include/asm/page.h

@@ -34 +34 @@
 #endif
 
-typedef struct { unsigned long long pgprot; } pgprot_t;
+typedef struct { unsigned long pgprot; } pgprot_t;
 
 #define pte_val(x)      ((x).pte)
@@ -41 +41 @@
 #define pgprot_val(x)   ((x).pgprot)
 
-pgprot_t __pgprot(int x);
+#define __pgprot(x)     ((pgprot_t) { (x) } )
 
 #endif /* !__ASSEMBLY__ */

GPL/trunk/lib32/misc.c

@@ -1 @@
-/* $Id: misc.c,v 1.1.1.1 2003/07/02 13:57:02 eleph Exp $ */
 /*
  * OS/2 implementation of misc. Linux kernel services
@@ -120 +119 @@
 //******************************************************************************
 //******************************************************************************
-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);
-}
-//******************************************************************************
-//******************************************************************************
 struct proc_dir_entry proc_root = {0};
 //******************************************************************************