[kernel] r14650 - in dists/trunk/linux-2.6/debian/patches: bugfix/arm bugfix/mips series

[Martin Michlmayr]

Author: tbm
Date: Thu Nov 19 16:54:19 2009
New Revision: 14650

Log:
add some build fixes that still haven't made it in

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/scsi-osd-build-fix.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/videobuf-dma-build-fix.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/mips/drm-ttm-build-fix.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/series/base

Added: dists/trunk/linux-2.6/debian/patches/bugfix/arm/scsi-osd-build-fix.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/scsi-osd-build-fix.patch	Thu Nov 19 16:54:19 2009	(r14650)
@@ -0,0 +1,26 @@
+From: Martin Michlmayr <tbm at cyrius.com>
+
+include/scsi/osd_protocol.h uses ALIGN() without an #include
+<linux/kernel.h>, leading to:
+| include/scsi/osd_protocol.h:362: error: implicit declaration of function 'ALIGN'
+
+Signed-off-by: Martin Michlmayr <tbm at cyrius.com>
+Signed-off-by: Boaz Harrosh <bharrosh at panasas.com>
+---
+ include/scsi/osd_protocol.h |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/include/scsi/osd_protocol.h b/include/scsi/osd_protocol.h
+index 2cc8e8b..6856612 100644
+--- a/include/scsi/osd_protocol.h
++++ b/include/scsi/osd_protocol.h
+@@ -17,6 +17,7 @@
+ #define __OSD_PROTOCOL_H__
+ 
+ #include <linux/types.h>
++#include <linux/kernel.h>
+ #include <asm/unaligned.h>
+ #include <scsi/scsi.h>
+ 
+-- 
+1.6.5.2

Added: dists/trunk/linux-2.6/debian/patches/bugfix/arm/videobuf-dma-build-fix.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/videobuf-dma-build-fix.patch	Thu Nov 19 16:54:19 2009	(r14650)
@@ -0,0 +1,23 @@
+media/video/videobuf-dma-contig.c fails to compile on ARM Versatile
+like this:
+ | videobuf-dma-contig.c: In function ‘videobuf_dma_contig_user_get’:
+ | videobuf-dma-contig.c:139: error: dereferencing pointer to incomplete type
+ | videobuf-dma-contig.c:184: error: dereferencing pointer to incomplete type
+ | make[8]: *** [drivers/media/video/videobuf-dma-contig.o] Error 1
+
+Looking at the preprocessed source, I noticed that there was no definition
+for struct task_struct.
+
+Signed-off-by: Martin Michlmayr <tbm at cyrius.com>
+
+--- a/drivers/media/video/videobuf-dma-contig.c	2009-10-31 10:22:42.000000000 +0000
++++ b/drivers/media/video/videobuf-dma-contig.c	2009-10-31 10:24:40.000000000 +0000
+@@ -19,6 +19,7 @@
+ #include <linux/mm.h>
+ #include <linux/pagemap.h>
+ #include <linux/dma-mapping.h>
++#include <linux/sched.h>
+ #include <media/videobuf-dma-contig.h>
+ 
+ struct videobuf_dma_contig_memory {
+

Added: dists/trunk/linux-2.6/debian/patches/bugfix/mips/drm-ttm-build-fix.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/mips/drm-ttm-build-fix.patch	Thu Nov 19 16:54:19 2009	(r14650)
@@ -0,0 +1,25 @@
+drm/ttm: Fix build failure due to missing struct page
+
+drm/ttm fails to build on MIPS because "struct page" is not known:
+| In file included from drivers/gpu/drm/ttm/ttm_memory.c:28:
+| include/drm/ttm/ttm_memory.h:154: warning: 'struct page' declared inside parameter list
+| include/drm/ttm/ttm_memory.h:154: warning: its scope is only this definition or declaration, which is probably not what you want
+| include/drm/ttm/ttm_memory.h:156: warning: 'struct page' declared inside parameter list
+| drivers/gpu/drm/ttm/ttm_memory.c:540: error: conflicting types for 'ttm_mem_global_alloc_page'
+| include/drm/ttm/ttm_memory.h:154: error: previous declaration of 'ttm_mem_global_alloc_page' was here
+| drivers/gpu/drm/ttm/ttm_memory.c:561: error: conflicting types for 'ttm_mem_global_free_page'
+| include/drm/ttm/ttm_memory.h:156: error: previous declaration of 'ttm_mem_global_free_page' was here
+
+Signed-off-by: Martin Michlmayr <tbm at cyrius.com>
+
+--- a/include/drm/ttm/ttm_memory.h
++++ b/include/drm/ttm/ttm_memory.h
+@@ -33,6 +33,7 @@
+ #include <linux/wait.h>
+ #include <linux/errno.h>
+ #include <linux/kobject.h>
++#include <linux/mm.h>
+ 
+ /**
+  * struct ttm_mem_shrink - callback to shrink TTM memory usage.
+

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Wed Nov 18 21:03:31 2009	(r14649)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Thu Nov 19 16:54:19 2009	(r14650)
@@ -48,3 +48,6 @@
 + features/arm/compression-add-lzmo.patch
 + features/arm/openrd-client.patch
 + features/arm/ts41x.patch
++ bugfix/arm/videobuf-dma-build-fix.patch
++ bugfix/arm/scsi-osd-build-fix.patch
++ bugfix/mips/drm-ttm-build-fix.patch