Changeset 426 for GPL/trunk/alsa-kernel/include/sound/config.h

Timestamp:

May 9, 2009, 11:45:26 AM (16 years ago)

Author:

Paul Smedley

Message:

Update alsa-kernel to ALSA 1.0.20 level

File:

• GPL/trunk/alsa-kernel/include/sound/config.h (modified) (2 diffs)

GPL/trunk/alsa-kernel/include/sound/config.h

@@ -422 +422 @@
 #endif
 
+typedef unsigned __nocast gfp_t;
+
 #ifndef CONFIG_HAVE_KZALLOC
-void *snd_compat_kzalloc(size_t n, unsigned int __nocast gfp_flags);
+void *snd_compat_kzalloc(size_t n, gfp_t gfp_flags);
 #define kzalloc(s,f) snd_compat_kzalloc(s,f)
+
 #endif
 
@@ -655 +658 @@
 #endif
 
+#ifndef DMA_BIT_MASK
+#define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
+#endif
+
+/* memdup_user() wrapper */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30)
+#include <linux/err.h>
+#include <asm/uaccess.h>
+static inline void *memdup_user(void __user *src, size_t len)
+{
+        void *p = kmalloc(len, GFP_KERNEL);
+        if (!p)
+                return ERR_PTR(-ENOMEM);
+        if (copy_from_user(p, src, len)) {
+                kfree(p);
+                return ERR_PTR(-EFAULT);
+        }
+        return p;
+}
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 6)
+#include <linux/workqueue.h>
+#ifndef create_singlethread_workqueue
+#define create_singlethread_workqueue(name) create_workqueue(name)
+#endif
+#endif
+
 #endif //__ALSA_CONFIG_H__