Added osscore.patch to allow osscore.ko building with latest kernel.

3 files changed, 54 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dc80a3d1f257..4fbfb3c79003 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -17,6 +17,7 @@ pkgbase = oss-git
 	source = kmod-link.patch
 	source = kmod-link2.patch
 	source = ossvermagic.patch
+	source = osscore.patch
 	source = extramodules.patch
 	sha512sums = SKIP
 	sha512sums = 5599f75ac2784aca7d0367e88705938d2680e7a0eb7ae7300080e3fc0ea0c9d3b183554a9e208ed8359f675028024e8de62baa5f8dbc79e9f3bd942db6aa6157
@@ -28,6 +29,7 @@ pkgbase = oss-git
 	sha512sums = f73b837643c7b86c5ce3a2ff18a66b99166d16ac7d1ac3d419b203efd8d398d8c4b21c304d6fa1c038ebf180ca0620d6517be384b307bb66e84a15b0339800df
 	sha512sums = 6cefeca6921916d2fbf7c4efd354d3c0b7f7285c6d049912bd318f0b520698a2de2a974604a56a7b288636939773ef49f022962bb88f9e3b5ea442462a50de1b
 	sha512sums = 5db4bb6d636983485bc56aa7dd83347de848624d4ff160c1ec77d7d21d22154be61cad393af2d772f58bca47494d853dd5b286e4820440bd339cbb6edd50d1db
+	sha512sums = 0ca7b5ce6e63aadcfef763d105fa141260c2db002dd587200ada6d1c8c0abd4fdc2ca728b76d638181504faf58df3edbacb39cda2a988e1dd13facd962792c9e
 	sha512sums = 1537b87e8d0c3b222f980da9d69190dd67d09ba906c810e59c01b486ae83bd378ad9c542908b08540b13bf5a151ed2632e8c590d867e7fef8d1c0c30057e3a9b
 
 pkgname = oss-git
@@ -52,4 +54,3 @@ pkgname = libflashsupport-oss-git
 	conflicts = libflashsupport-oss
 	conflicts = libflashsupport-oss-nonfree
 	conflicts = libflashsupport-pulse
-
diff --git a/PKGBUILD b/PKGBUILD
index 70352ebca97d..b3a9be8cbdf2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -28,6 +28,7 @@ source=(oss::git://git.code.sourceforge.net/p/opensound/git
         kmod-link.patch
         kmod-link2.patch
         ossvermagic.patch
+        osscore.patch
         extramodules.patch)
 sha512sums=('SKIP'
             '5599f75ac2784aca7d0367e88705938d2680e7a0eb7ae7300080e3fc0ea0c9d3b183554a9e208ed8359f675028024e8de62baa5f8dbc79e9f3bd942db6aa6157'
@@ -39,6 +40,7 @@ sha512sums=('SKIP'
             'f73b837643c7b86c5ce3a2ff18a66b99166d16ac7d1ac3d419b203efd8d398d8c4b21c304d6fa1c038ebf180ca0620d6517be384b307bb66e84a15b0339800df'
             '6cefeca6921916d2fbf7c4efd354d3c0b7f7285c6d049912bd318f0b520698a2de2a974604a56a7b288636939773ef49f022962bb88f9e3b5ea442462a50de1b'
             '5db4bb6d636983485bc56aa7dd83347de848624d4ff160c1ec77d7d21d22154be61cad393af2d772f58bca47494d853dd5b286e4820440bd339cbb6edd50d1db'
+            '0ca7b5ce6e63aadcfef763d105fa141260c2db002dd587200ada6d1c8c0abd4fdc2ca728b76d638181504faf58df3edbacb39cda2a988e1dd13facd962792c9e'
             '1537b87e8d0c3b222f980da9d69190dd67d09ba906c810e59c01b486ae83bd378ad9c542908b08540b13bf5a151ed2632e8c590d867e7fef8d1c0c30057e3a9b')
 
 
@@ -67,6 +69,7 @@ prepare() {
   # patch -p1 < "$srcdir/galaxy.patch"
   # - no longer required (from commit 4d221f) 
   # patch -p1 < "$srcdir/ossvermagic.patch"
+  patch -p1 < "$srcdir/osscore.patch"
   patch -p1 < "$srcdir/extramodules.patch"
 
   # make OSS compile with glibc >= 2.23
diff --git a/osscore.patch b/osscore.patch
new file mode 100644
index 000000000000..2335e8d82d87
--- /dev/null
+++ b/osscore.patch
@@ -0,0 +1,49 @@
+diff --git a/setup/Linux/oss/build/osscore.c b/setup/Linux/oss/build/osscore.c
+index d69c66d..232f8cd 100644
+--- a/setup/Linux/oss/build/osscore.c
++++ b/setup/Linux/oss/build/osscore.c
+@@ -117,7 +117,7 @@ oss_kmem_free (void *addr)
+   vfree (addr);
+ }
+ 
+-/* oss_pmalloc() moved to os_linux.c */
++/* oss_pmalloc() moved to os_linux.c
+ 
+ extern oss_native_word
+ oss_virt_to_bus (void *addr)
+@@ -125,6 +125,7 @@ oss_virt_to_bus (void *addr)
+   return virt_to_bus (addr);
+ }
+ 
++ */
+ void *
+ oss_memcpy (void *t_, const void *f_, size_t l)
+ {
+@@ -138,6 +139,9 @@ oss_memcpy (void *t_, const void *f_, size_t l)
+   return t;
+ }
+ 
++#ifdef memmove
++#undef memmove
++#endif
+ void *memmove(void *dest, const void *src, size_t n)
+ {
+ 	return oss_memcpy(dest, src, n);
+@@ -912,7 +916,7 @@ oss_contig_malloc (oss_device_t * osdev, int buffsize, oss_uint64_t memlimit,
+ 			 (oss_native_word) end_addr);
+     }
+ 
+-  *phaddr = virt_to_bus (start_addr);
++  *phaddr = virt_to_phys(start_addr);
+   return start_addr;
+ }
+ 
+@@ -2091,7 +2095,7 @@ EXPORT_SYMBOL (oss_spin_unlock_irqrestore);
+ EXPORT_SYMBOL (oss_udelay);
+ EXPORT_FUNC (oss_unregister_device);
+ EXPORT_SYMBOL (oss_unregister_interrupts);
+-EXPORT_SYMBOL (oss_virt_to_bus);
++// EXPORT_SYMBOL (oss_virt_to_bus);
+ EXPORT_FUNC (oss_pci_read_config_byte);
+ EXPORT_FUNC (oss_pci_read_config_word);
+ EXPORT_FUNC (oss_pci_read_config_dword);