- shmem: remove unneeded test for null inode->i_sb (James Morris)

- kill unused var warning in traps.c (Geert Uytterhoeven)

- s/u64/__u64/ in bitops.h (needed for klibc)

- comment fix in gfp.h (Matthew Dobson <colpatch@us.ibm.com>)


 arch/i386/kernel/traps.c |    2 --
 include/linux/bitops.h   |    2 +-
 include/linux/gfp.h      |    2 +-
 mm/shmem.c               |    2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff -puN mm/shmem.c~misc5 mm/shmem.c
--- 25/mm/shmem.c~misc5	2003-06-16 15:40:52.000000000 -0700
+++ 25-akpm/mm/shmem.c	2003-06-16 15:40:52.000000000 -0700
@@ -1010,7 +1010,7 @@ static int shmem_mmap(struct file *file,
 	struct inode *inode = file->f_dentry->d_inode;
 
 	ops = &shmem_vm_ops;
-	if (!inode->i_sb || !S_ISREG(inode->i_mode))
+	if (!S_ISREG(inode->i_mode))
 		return -EACCES;
 	update_atime(inode);
 	vma->vm_ops = ops;
diff -puN arch/i386/kernel/traps.c~misc5 arch/i386/kernel/traps.c
--- 25/arch/i386/kernel/traps.c~misc5	2003-06-16 15:40:52.000000000 -0700
+++ 25-akpm/arch/i386/kernel/traps.c	2003-06-16 15:51:34.000000000 -0700
@@ -130,7 +130,6 @@ static int kstack_depth_to_print = 24;
 
 void show_trace(struct task_struct *task, unsigned long * stack)
 {
-	int i;
 	unsigned long addr;
 
 	if (!stack)
@@ -140,7 +139,6 @@ void show_trace(struct task_struct *task
 #ifdef CONFIG_KALLSYMS
 	printk("\n");
 #endif
-	i = 1;
 	while (((long) stack & (THREAD_SIZE-1)) != 0) {
 		addr = *stack++;
 		if (kernel_text_address(addr)) {
diff -puN include/linux/bitops.h~misc5 include/linux/bitops.h
--- 25/include/linux/bitops.h~misc5	2003-06-16 15:40:52.000000000 -0700
+++ 25-akpm/include/linux/bitops.h	2003-06-16 15:40:52.000000000 -0700
@@ -108,7 +108,7 @@ static inline unsigned int generic_hweig
         return (res & 0x0F) + ((res >> 4) & 0x0F);
 }
 
-static inline unsigned long generic_hweight64(u64 w)
+static inline unsigned long generic_hweight64(__u64 w)
 {
 #if BITS_PER_LONG < 64
 	return generic_hweight32((unsigned int)(w >> 32)) +
diff -puN include/linux/gfp.h~misc5 include/linux/gfp.h
--- 25/include/linux/gfp.h~misc5	2003-06-16 15:51:43.000000000 -0700
+++ 25-akpm/include/linux/gfp.h	2003-06-16 15:51:51.000000000 -0700
@@ -7,7 +7,7 @@
 /*
  * GFP bitmasks..
  */
-/* Zone modifiers in GFP_ZONEMASK (see linux/mmzone.h - low four bits) */
+/* Zone modifiers in GFP_ZONEMASK (see linux/mmzone.h - low two bits) */
 #define __GFP_DMA	0x01
 #define __GFP_HIGHMEM	0x02
 

_