From 6406972051572ddff0b5e55aac478de9abd8c3ee Mon Sep 17 00:00:00 2001 From: Trent Piepho Date: Wed, 31 Oct 2007 21:16:08 -0700 Subject: Add VIDEOBUF_VMALLOC to versions.txt From: Trent Piepho It uses remap_vmalloc_range(), which wasn't added until 1.6.18 Signed-off-by: Trent Piepho --- v4l/versions.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'v4l') diff --git a/v4l/versions.txt b/v4l/versions.txt index bb6c766c5..8c3b6ed38 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -11,6 +11,10 @@ VIDEO_TCM825X #This driver were developed at kernel 2.6.19, requiring vmalloc_user/remap_vmalloc_range VIDEO_CAFE_CCIC +# Uses remap_vmalloc_range() +[2.6.18] +VIDEOBUF_VMALLOC + # DVB_CORE_ATTACH relies on symbol_put_addr which hangs pre-2.6.17 [2.6.17] DVB_CORE_ATTACH -- cgit v1.2.3 From a64dab8aa3caf709b812006586449427fda56857 Mon Sep 17 00:00:00 2001 From: Trent Piepho Date: Wed, 31 Oct 2007 21:16:08 -0700 Subject: Remove obsolete VIDEO_BUF modules from versions.txt From: Trent Piepho Someone forgot to remove them when they renamed them VIDEOBUF. Signed-off-by: Trent Piepho --- v4l/versions.txt | 2 -- 1 file changed, 2 deletions(-) (limited to 'v4l') diff --git a/v4l/versions.txt b/v4l/versions.txt index 8c3b6ed38..affc221bb 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -188,8 +188,6 @@ DVB_TDA18271 VIDEO_SAA7146 VIDEO_SAA7146_VV VIDEO_TUNER -VIDEO_BUF -VIDEO_BUF_DVB VIDEO_BTCX VIDEO_IR VIDEO_TVEEPROM -- cgit v1.2.3 From ea8eb5444481b26dfae9068b9285c01187bd66d5 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 2 Nov 2007 14:53:23 -0200 Subject: Backport commit ba25f9dcc4ea6e30839fcab5a5516f2176d5bfed kern-sync: Author: Pavel Emelyanov Date: Thu Oct 18 23:40:40 2007 -0700 Use helpers to obtain task pid in printks The task_struct->pid member is going to be deprecated, so start using the helpers (task_pid_nr/task_pid_vnr/task_pid_nr_ns) in the kernel. The first thing to start with is the pid, printed to dmesg - in this case we may safely use task_pid_nr(). Besides, printks produce more (much more) than a half of all the explicit pid usage. Signed-off-by: Mauro Carvalho Chehab --- v4l/compat.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'v4l') diff --git a/v4l/compat.h b/v4l/compat.h index db45d91f0..6f198e688 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -462,6 +462,10 @@ static inline unsigned int snd_pcm_rate_to_rate_bit(unsigned int rate) } #endif +#ifndef task_pid_nr +# define task_pid_nr(current) ((current)->pid) +#endif + #endif /* * Local variables: -- cgit v1.2.3 From 49335aab3d6d92e5022bae733347abb40332e5e6 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 2 Nov 2007 17:32:46 -0200 Subject: Backport some changesets touching S/G code From: Mauro Carvalho Chehab kernel-sync: Backport kernel changesets: 45711f1af6eff1a6d010703b4862e0d2b9afd056 117636092a87a28a013a4acb5de5492645ed620f 642f149031d70415d9318b919d50b71e4724adbd Also, added newer entreis at compat.h, to avoid needing to add checks for linux versions inside the source codes. Signed-off-by: Mauro Carvalho Chehab --- v4l/compat.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'v4l') diff --git a/v4l/compat.h b/v4l/compat.h index 6f198e688..4e23e5fc5 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -466,6 +466,19 @@ static inline unsigned int snd_pcm_rate_to_rate_bit(unsigned int rate) # define task_pid_nr(current) ((current)->pid) #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) +# define sg_init_table(a,b) +# define sg_page(p) (sg->page) +# define sg_set_page(sglist,pg,sz,off) \ +do { \ + struct scatterlist *p=sglist; \ + p->page = pg; \ + p->length = sz; \ + p->offset = off; \ +} while (0) +#endif + + #endif /* * Local variables: -- cgit v1.2.3 From 402c1ace76e132bcff86383212b3d2c66b40fd77 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 2 Nov 2007 18:00:10 -0200 Subject: Add compatibility code for BIT_MASK and BIT_WORD From: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab --- v4l/compat.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'v4l') diff --git a/v4l/compat.h b/v4l/compat.h index 4e23e5fc5..e4877e865 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -478,6 +478,10 @@ do { \ } while (0) #endif +#ifndef BIT_MASK +# define BIT_MASK(nr) (1UL << ((nr) % BITS_PER_LONG)) +# define BIT_WORD(nr) ((nr) / BITS_PER_LONG) +#endif #endif /* -- cgit v1.2.3