Linux Kernel Mailing List | 1 Sep 2004 01:40

[PATCH] missing includes from irq changes

ChangeSet 1.1865, 2004/08/31 16:40:37-07:00, viro <at> www.linux.org.uk

	[PATCH] missing includes from irq changes
	
	Signed-off-by: Al Viro <viro <at> parcelfarce.linux.org.uk>
	Signed-off-by: Linus Torvalds <torvalds <at> osdl.org>

 alpha/kernel/irq.c |    4 +---
 ppc/kernel/irq.c   |    1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff -Nru a/arch/alpha/kernel/irq.c b/arch/alpha/kernel/irq.c
--- a/arch/alpha/kernel/irq.c	2004-08-31 20:06:01 -07:00
+++ b/arch/alpha/kernel/irq.c	2004-08-31 20:06:01 -07:00
 <at>  <at>  -25,6 +25,7  <at>  <at> 
 #include <linux/irq.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+#include <linux/profile.h>

 #include <asm/system.h>
 #include <asm/io.h>
 <at>  <at>  -330,9 +331,6  <at>  <at> 
 void
 init_irq_proc (void)
 {
-#ifdef CONFIG_SMP
-	struct proc_dir_entry *entry;
-#endif
 	int i;
(Continue reading)

Linux Kernel Mailing List | 1 Sep 2004 01:40

[PATCH] mmc annotation

ChangeSet 1.1866, 2004/08/31 16:40:49-07:00, viro <at> www.linux.org.uk

	[PATCH] mmc annotation
	
	Signed-off-by: Al Viro <viro <at> parcelfarce.linux.org.uk>
	Signed-off-by: Linus Torvalds <torvalds <at> osdl.org>

 mmc_block.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -Nru a/drivers/mmc/mmc_block.c b/drivers/mmc/mmc_block.c
--- a/drivers/mmc/mmc_block.c	2004-08-31 20:06:12 -07:00
+++ b/drivers/mmc/mmc_block.c	2004-08-31 20:06:12 -07:00
 <at>  <at>  -124,7 +124,7  <at>  <at> 
 		geo.sectors	= 16;
 		geo.start	= get_start_sect(bdev);

-		return copy_to_user((void *)arg, &geo, sizeof(geo))
+		return copy_to_user((void __user *)arg, &geo, sizeof(geo))
 			? -EFAULT : 0;
 	}

Linux Kernel Mailing List | 1 Sep 2004 01:41

[PATCH] missing include compiler.h in arm memory.h

ChangeSet 1.1867, 2004/08/31 16:41:01-07:00, viro <at> www.linux.org.uk

	[PATCH] missing include compiler.h in arm memory.h
	
	use of __deprecated requires compiler.h
	
	Signed-off-by: Al Viro <viro <at> parcelfarce.linux.org.uk>
	Signed-off-by: Linus Torvalds <torvalds <at> osdl.org>

 memory.h |    1 +
 1 files changed, 1 insertion(+)

diff -Nru a/include/asm-arm/memory.h b/include/asm-arm/memory.h
--- a/include/asm-arm/memory.h	2004-08-31 20:06:22 -07:00
+++ b/include/asm-arm/memory.h	2004-08-31 20:06:22 -07:00
 <at>  <at>  -13,6 +13,7  <at>  <at> 
 #define __ASM_ARM_MEMORY_H

 #include <linux/config.h>
+#include <linux/compiler.h>
 #include <asm/arch/memory.h>

 #ifndef TASK_SIZE
Linux Kernel Mailing List | 1 Sep 2004 01:41

[PATCH] alpha warning fixes

ChangeSet 1.1868, 2004/08/31 16:41:13-07:00, viro <at> www.linux.org.uk

	[PATCH] alpha warning fixes
	
	pci_dma_sync_single_for_device() had wrong prototype [who TF had come up
	with that name, anyway?]
	->cpu in thread_info was long; it should be unsigned int.
	
	Signed-off-by: Al Viro <viro <at> parcelfarce.linux.org.uk>
	Signed-off-by: Linus Torvalds <torvalds <at> osdl.org>

 pci.h         |    2 +-
 thread_info.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff -Nru a/include/asm-alpha/pci.h b/include/asm-alpha/pci.h
--- a/include/asm-alpha/pci.h	2004-08-31 20:06:33 -07:00
+++ b/include/asm-alpha/pci.h	2004-08-31 20:06:33 -07:00
 <at>  <at>  -169,7 +169,7  <at>  <at> 

 static inline void
 pci_dma_sync_single_for_device(struct pci_dev *dev, dma_addr_t dma_addr,
-			       long size, int direction)
+			       size_t size, int direction)
 {
 	/* Nothing to do.  */
 }
diff -Nru a/include/asm-alpha/thread_info.h b/include/asm-alpha/thread_info.h
--- a/include/asm-alpha/thread_info.h	2004-08-31 20:06:33 -07:00
+++ b/include/asm-alpha/thread_info.h	2004-08-31 20:06:33 -07:00
(Continue reading)

Linux Kernel Mailing List | 1 Sep 2004 01:41

[PATCH] usx2y cleanups and fixes

ChangeSet 1.1869, 2004/08/31 16:41:25-07:00, viro <at> www.linux.org.uk

	[PATCH] usx2y cleanups and fixes
	
	Sigh...
		a) mixing of userland and kernel pointers is bad
		b) so's not checking result of kmalloc()
		c) so's not checking result of copy_from_user()
		d) use of do { .... break; ... break; ... } while(0); is *highly*
	unidiomatic.  Do not confuse kernel with IOCCC, please. And if you have
	religious aversion to multiple return statements in a function, at least
	learn the reasons why it is frowned upon in many situations.  Hint: they
	all apply to use of break in that manner.
		e) 0 instead of NULL
	
	Signed-off-by: Al Viro <viro <at> parcelfarce.linux.org.uk>
	Signed-off-by: Linus Torvalds <torvalds <at> osdl.org>

 usX2Yhwdep.c    |   65 +++++++++++++++++++++++++++++++-------------------------
 usbusx2y.c      |    4 +--
 usbusx2yaudio.c |    8 +++---
 3 files changed, 42 insertions(+), 35 deletions(-)

diff -Nru a/sound/usb/usx2y/usX2Yhwdep.c b/sound/usb/usx2y/usX2Yhwdep.c
--- a/sound/usb/usx2y/usX2Yhwdep.c	2004-08-31 20:06:43 -07:00
+++ b/sound/usb/usx2y/usX2Yhwdep.c	2004-08-31 20:06:43 -07:00
 <at>  <at>  -211,43 +211,50  <at>  <at> 

 static int snd_usX2Y_hwdep_dsp_load(snd_hwdep_t *hw, snd_hwdep_dsp_image_t *dsp)
 {
(Continue reading)

Linux Kernel Mailing List | 1 Sep 2004 01:41

[PATCH] missing include in pcm_native.c

ChangeSet 1.1870, 2004/08/31 16:41:37-07:00, viro <at> www.linux.org.uk

	[PATCH] missing include in pcm_native.c
	
	compile fix for alpha - io.h is needed there for io_remap_...()
	
	Signed-off-by: Al Viro <viro <at> parcelfarce.linux.org.uk>
	Signed-off-by: Linus Torvalds <torvalds <at> osdl.org>

 pcm_native.c |    1 +
 1 files changed, 1 insertion(+)

diff -Nru a/sound/core/pcm_native.c b/sound/core/pcm_native.c
--- a/sound/core/pcm_native.c	2004-08-31 20:06:54 -07:00
+++ b/sound/core/pcm_native.c	2004-08-31 20:06:54 -07:00
 <at>  <at>  -33,6 +33,7  <at>  <at> 
 #include <sound/pcm_params.h>
 #include <sound/timer.h>
 #include <sound/minors.h>
+#include <asm/io.h>

 /*
  *  Compatibility
Linux Kernel Mailing List | 1 Sep 2004 01:41

[PATCH] acpi/processor.c 64bit portability

ChangeSet 1.1871, 2004/08/31 16:41:49-07:00, viro <at> www.linux.org.uk

	[PATCH] acpi/processor.c 64bit portability
	
	wrong type of return value for ->write()
	
	Signed-off-by: Al Viro <viro <at> parcelfarce.linux.org.uk>
	Signed-off-by: Linus Torvalds <torvalds <at> osdl.org>

 processor.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -Nru a/drivers/acpi/processor.c b/drivers/acpi/processor.c
--- a/drivers/acpi/processor.c	2004-08-31 20:07:04 -07:00
+++ b/drivers/acpi/processor.c	2004-08-31 20:07:04 -07:00
 <at>  <at>  -1123,7 +1123,7  <at>  <at> 
 						PDE(inode)->data);
 }

-static int
+static ssize_t
 acpi_processor_write_performance (
         struct file		*file,
         const char		__user *buffer,
Linux Kernel Mailing List | 1 Sep 2004 01:42

[PATCH] acpiphp_ibm.c 64bit portability

ChangeSet 1.1872, 2004/08/31 16:42:01-07:00, viro <at> www.linux.org.uk

	[PATCH] acpiphp_ibm.c 64bit portability
	
	Signed-off-by: Al Viro <viro <at> parcelfarce.linux.org.uk>
	Signed-off-by: Linus Torvalds <torvalds <at> osdl.org>

 acpiphp_ibm.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff -Nru a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
--- a/drivers/pci/hotplug/acpiphp_ibm.c	2004-08-31 20:07:14 -07:00
+++ b/drivers/pci/hotplug/acpiphp_ibm.c	2004-08-31 20:07:14 -07:00
 <at>  <at>  -340,7 +340,7  <at>  <at> 
 	int bytes_read = -EINVAL;
 	char *table = NULL;
 	
-	dbg("%s: pos = %d, size = %d\n", __FUNCTION__, (int)pos, size);
+	dbg("%s: pos = %d, size = %zd\n", __FUNCTION__, (int)pos, size);

 	if (pos == 0) {
 		bytes_read = ibm_get_table_from_acpi(&table);
 <at>  <at>  -383,8 +383,8  <at>  <at> 
 	if(info.current_status && (info.valid & ACPI_VALID_HID) &&
 			(!strcmp(info.hardware_id.value, IBM_HARDWARE_ID1) ||
 			!strcmp(info.hardware_id.value, IBM_HARDWARE_ID2))) {
-		dbg("found hardware: %s, handle: %x\n", info.hardware_id.value,
-				(unsigned int)handle);
+		dbg("found hardware: %s, handle: %p\n", info.hardware_id.value,
+				handle);
(Continue reading)

Linux Kernel Mailing List | 1 Sep 2004 01:42

[PATCH] alpha csum_partial_copy.c annotations

ChangeSet 1.1873, 2004/08/31 16:42:13-07:00, viro <at> www.linux.org.uk

	[PATCH] alpha csum_partial_copy.c annotations
	
	Signed-off-by: Al Viro <viro <at> parcelfarce.linux.org.uk>
	Signed-off-by: Linus Torvalds <torvalds <at> osdl.org>

 csum_partial_copy.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff -Nru a/arch/alpha/lib/csum_partial_copy.c b/arch/alpha/lib/csum_partial_copy.c
--- a/arch/alpha/lib/csum_partial_copy.c	2004-08-31 20:07:24 -07:00
+++ b/arch/alpha/lib/csum_partial_copy.c	2004-08-31 20:07:24 -07:00
 <at>  <at>  -193,7 +193,8  <at>  <at> 
  * This is slightly less fun than the above..
  */
 static inline unsigned long
-csum_partial_cfu_src_aligned(const unsigned long *src, unsigned long *dst,
+csum_partial_cfu_src_aligned(const unsigned long __user *src,
+			     unsigned long *dst,
 			     unsigned long doff,
 			     long len, unsigned long checksum,
 			     unsigned long partial_dest,
 <at>  <at>  -372,7 +373,7  <at>  <at> 
 csum_partial_copy_from_user(const char __user *src, char *dst, int len,
 			    unsigned int sum, int *errp)
 {
-	if (!access_ok(src, len, VERIFY_READ)) {
+	if (!access_ok(VERIFY_READ, src, len)) {
 		*errp = -EFAULT;
(Continue reading)

Linux Kernel Mailing List | 1 Sep 2004 01:42

[PATCH] netfilter warning (alpha)

ChangeSet 1.1874, 2004/08/31 16:42:24-07:00, viro <at> www.linux.org.uk

	[PATCH] netfilter warning (alpha)
	
	On alpha u64 is unsigned long; %llu is unsigned long long...
	
	Signed-off-by: Al Viro <viro <at> parcelfarce.linux.org.uk>
	Signed-off-by: Linus Torvalds <torvalds <at> osdl.org>

 ip_conntrack_standalone.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff -Nru a/net/ipv4/netfilter/ip_conntrack_standalone.c b/net/ipv4/netfilter/ip_conntrack_standalone.c
--- a/net/ipv4/netfilter/ip_conntrack_standalone.c	2004-08-31 20:07:34 -07:00
+++ b/net/ipv4/netfilter/ip_conntrack_standalone.c	2004-08-31 20:07:34 -07:00
 <at>  <at>  -73,7 +73,8  <at>  <at> 
 seq_print_counters(struct seq_file *s, struct ip_conntrack_counter *counter)
 {
 	return seq_printf(s, "packets=%llu bytes=%llu ",
-			  counter->packets, counter->bytes);
+			  (unsigned long long)counter->packets,
+			  (unsigned long long)counter->bytes);
 }
 #else
 #define seq_print_counters(x, y)	0

Gmane