Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6405c9cd authored by Steve French's avatar Steve French
Browse files

Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

parents bcc55c66 4c246edd

arch/alpha/kernel/osf_sys.c

+12 −7
Original line number Diff line number Diff line
@@ -121,24 +121,29 @@ osf_filldir(void *__buf, const char *name, int namlen, loff_t offset, 
	if (reclen > buf->count)

		return -EINVAL;

	d_ino = ino;

	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)

	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) {

		buf->error = -EOVERFLOW;

		return -EOVERFLOW;

	}

	if (buf->basep) {

		if (put_user(offset, buf->basep))

			return -EFAULT;

			goto Efault;

		buf->basep = NULL;

	}

	dirent = buf->dirent;

	put_user(d_ino, &dirent->d_ino);

	put_user(namlen, &dirent->d_namlen);

	put_user(reclen, &dirent->d_reclen);

	if (copy_to_user(dirent->d_name, name, namlen) ||

	if (put_user(d_ino, &dirent->d_ino) ||

	    put_user(namlen, &dirent->d_namlen) ||

	    put_user(reclen, &dirent->d_reclen) ||

	    copy_to_user(dirent->d_name, name, namlen) ||

	    put_user(0, dirent->d_name + namlen))

		return -EFAULT;

		goto Efault;

	dirent = (void __user *)dirent + reclen;

	buf->dirent = dirent;

	buf->count -= reclen;

	return 0;

Efault:

	buf->error = -EFAULT;

	return -EFAULT;

}



asmlinkage int

arch/ia64/include/asm/io.h

+6 −4
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
 * Copyright (C) 1999 Don Dugger <don.dugger@intel.com>

 */



#include <asm/unaligned.h>



/* We don't use IO slowdowns on the ia64, but.. */

#define __SLOW_DOWN_IO	do { } while (0)

#define SLOW_DOWN_IO	do { } while (0)
@@ -241,7 +243,7 @@ __insw (unsigned long port, void *dst, unsigned long count) 
	unsigned short *dp = dst;



	while (count--)

		*dp++ = platform_inw(port);

		put_unaligned(platform_inw(port), dp++);

}



static inline void
@@ -250,7 +252,7 @@ __insl (unsigned long port, void *dst, unsigned long count) 
	unsigned int *dp = dst;



	while (count--)

		*dp++ = platform_inl(port);

		put_unaligned(platform_inl(port), dp++);

}



static inline void
@@ -268,7 +270,7 @@ __outsw (unsigned long port, const void *src, unsigned long count) 
	const unsigned short *sp = src;



	while (count--)

		platform_outw(*sp++, port);

		platform_outw(get_unaligned(sp++), port);

}



static inline void
@@ -277,7 +279,7 @@ __outsl (unsigned long port, const void *src, unsigned long count) 
	const unsigned int *sp = src;



	while (count--)

		platform_outl(*sp++, port);

		platform_outl(get_unaligned(sp++), port);

}



/*

arch/ia64/kernel/smpboot.c

+1 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ cpumask_t cpu_possible_map = CPU_MASK_NONE; 
EXPORT_SYMBOL(cpu_possible_map);



cpumask_t cpu_core_map[NR_CPUS] __cacheline_aligned;

EXPORT_SYMBOL(cpu_core_map);

DEFINE_PER_CPU_SHARED_ALIGNED(cpumask_t, cpu_sibling_map);

EXPORT_PER_CPU_SYMBOL(cpu_sibling_map);

arch/mips/emma2rh/markeins/setup.c

+1 −15
Original line number Diff line number Diff line
@@ -25,23 +25,9 @@ 
#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/types.h>

#include <linux/initrd.h>

#include <linux/irq.h>

#include <linux/ioport.h>

#include <linux/param.h>	/* for HZ */

#include <linux/root_dev.h>

#include <linux/serial.h>

#include <linux/serial_core.h>



#include <asm/cpu.h>

#include <asm/bootinfo.h>

#include <asm/addrspace.h>



#include <asm/time.h>

#include <asm/bcache.h>

#include <asm/irq.h>

#include <asm/reboot.h>

#include <asm/traps.h>

#include <asm/debug.h>



#include <asm/emma2rh/emma2rh.h>

arch/mips/jazz/setup.c

+1 −12
Original line number Diff line number Diff line
@@ -5,33 +5,22 @@ 
 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 *

 * Copyright (C) 1996, 1997, 1998, 2001, 07 by Ralf Baechle

 * Copyright (C) 1996, 1997, 1998, 2001, 07, 08 by Ralf Baechle

 * Copyright (C) 2001 MIPS Technologies, Inc.

 * Copyright (C) 2007 by Thomas Bogendoerfer

 */

#include <linux/eisa.h>

#include <linux/init.h>

#include <linux/ioport.h>

#include <linux/sched.h>

#include <linux/interrupt.h>

#include <linux/mm.h>

#include <linux/console.h>

#include <linux/fb.h>

#include <linux/pm.h>

#include <linux/screen_info.h>

#include <linux/platform_device.h>

#include <linux/serial_8250.h>



#include <asm/bootinfo.h>

#include <asm/irq.h>

#include <asm/jazz.h>

#include <asm/jazzdma.h>

#include <asm/reboot.h>

#include <asm/io.h>

#include <asm/pgtable.h>

#include <asm/time.h>

#include <asm/traps.h>

#include <asm/mc146818-time.h>



extern asmlinkage void jazz_handle_int(void);