Skip to contentSkip to conversation

alsa-drivers1.0.0rc2 won't compile on stock 2.6.1rc2 kernel - fixed it

PATCH Alexander Maassen 2 participants 2 messages Jan 7, 2004 – Jan 8, 2004

lore
Share & tools
lore
#0 lore raw

I had several issues getting alsa to compile and to load correctly, after some debugging and lots of coffee I've been able to fix those. Included is a unified diff so you all can enjoy the work in case you have the same error.

Kind regards,
Alexander Maassen

acore/memory_wrapper.c +8 -0
diff -burd alsa-driver-1.0.0rc2/acore/memory_wrapper.c alsa-driver-1.0.0rc2.new/acore/memory_wrapper.c
@@ -21,6 +21,10 @@
 #endif
 #endif
 
+#ifndef VMALLOC_VMADDR
+#define VMALLOC_VMADDR(x) ((unsigned long)(x))
+#endif
+
 /* vmalloc_to_page wrapper */
 #ifndef CONFIG_HAVE_VMALLOC_TO_PAGE
 #include <linux/highmem.h>
@@ -38,7 +42,11 @@
 #endif
 	pgd = pgd_offset(&init_mm, lpage);
 	pmd = pmd_offset(pgd, lpage);
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
+	pte = pte_offset_kernel(pmd, lpage);
+#else
 	pte = pte_offset(pmd, lpage);
+#endif
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
 	page = virt_to_page(pte_page(*pte));
 #else
acore/sgbuf.c +4 -0
diff -burd alsa-driver-1.0.0rc2/acore/sgbuf.c alsa-driver-1.0.0rc2.new/acore/sgbuf.c
@@ -44,7 +44,11 @@
 	lpage = VMALLOC_VMADDR(pageptr);
 	pgd = pgd_offset_k(lpage);
 	pmd = pmd_offset(pgd, lpage);
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
+	pte = pte_offset_kernel(pmd, lpage);
+#else
 	pte = pte_offset(pmd, lpage);
+#endif
 	return (void *)pte_page(*pte);
 }    
 #endif
include/adriver.h +2 -0
diff -burd alsa-driver-1.0.0rc2/include/adriver.h alsa-driver-1.0.0rc2.new/include/adriver.h
@@ -128,6 +128,7 @@
 #define need_resched() (current->need_resched)
 #endif
 #ifndef CONFIG_HAVE_PDE
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 1)
 #include <linux/fs.h>
 #include <linux/proc_fs.h>
 static inline struct proc_dir_entry *PDE(const struct inode *inode)
@@ -135,6 +136,7 @@
 	return (struct proc_dir_entry *) inode->u.generic_ip;
 }
 #endif
+#endif
 #ifndef cond_resched
 #define cond_resched() \
 	do { \
#1 lore raw

At Wed, 07 Jan 2004 20:35:46 +0100,

Quoted 6 lines · Alexander Maassen

[1 <text/plain; us-ascii (7bit)>]
I had several issues getting alsa to compile and to load correctly, after some debugging and lots of coffee I've been able to fix those. Included is a unified diff so you all can enjoy the work in case you have the same error.

the patch seems invalid for me.
all of them are in the ifdef's which 2.6.x shouldn't pass. i guess alsa-driver's configure script didn't check it correctly, or you copied the wrong files into your kernel tree.

just run configure on the top of alsa-driver (with options if necessary), or copy the files of alsa-kernel tree (not alsa-driver) to linux source tree and make modules there.

ciao,

Takashi

Quoted 59 lines

Kind regards,
Alexander Maassen
[2 alsa-driver-1.0.0rc2.diff <text/plain (7bit)>]
diff -burd alsa-driver-1.0.0rc2/acore/memory_wrapper.c alsa-driver-1.0.0rc2.new/acore/memory_wrapper.c

acore/memory_wrapper.c +8 -0
@@ -21,6 +21,10 @@
 #endif
 #endif
 
+#ifndef VMALLOC_VMADDR
+#define VMALLOC_VMADDR(x) ((unsigned long)(x))
+#endif
+
 /* vmalloc_to_page wrapper */
 #ifndef CONFIG_HAVE_VMALLOC_TO_PAGE
 #include <linux/highmem.h>
@@ -38,7 +42,11 @@
 #endif
 	pgd = pgd_offset(&init_mm, lpage);
 	pmd = pmd_offset(pgd, lpage);
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
+	pte = pte_offset_kernel(pmd, lpage);
+#else
 	pte = pte_offset(pmd, lpage);
+#endif
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
 	page = virt_to_page(pte_page(*pte));
 #else

diff -burd alsa-driver-1.0.0rc2/acore/sgbuf.c alsa-driver-1.0.0rc2.new/acore/sgbuf.c

acore/sgbuf.c +4 -0
@@ -44,7 +44,11 @@
 	lpage = VMALLOC_VMADDR(pageptr);
 	pgd = pgd_offset_k(lpage);
 	pmd = pmd_offset(pgd, lpage);
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
+	pte = pte_offset_kernel(pmd, lpage);
+#else
 	pte = pte_offset(pmd, lpage);
+#endif
 	return (void *)pte_page(*pte);
 }    
 #endif

diff -burd alsa-driver-1.0.0rc2/include/adriver.h alsa-driver-1.0.0rc2.new/include/adriver.h

include/adriver.h +1 -0
@@ -128,6 +128,7 @@
 #define need_resched() (current->need_resched)
 #endif
 #ifndef CONFIG_HAVE_PDE
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 1)
 #include <linux/fs.h>
 #include <linux/proc_fs.h>
 static inline struct proc_dir_entry *PDE(const struct inode *inode)

include/adriver.h line 142

Quoted 7 lines
include/adriver.h +1 -0
@@ -135,6 +136,7 @@
 	return (struct proc_dir_entry *) inode->u.generic_ip;
 }
 #endif
+#endif
 #ifndef cond_resched
 #define cond_resched() \
 	do { \

-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software. Perforce is the Fast Software Configuration Management System offering advanced branching capabilities and atomic changes on 50+ platforms. Free Eval! http://www.perforce.com/perforce/loadprog.html