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

Commit b946ecbb authored by Tony Luck's avatar Tony Luck
Browse files

Pull pending-2.6.14 into release branch

parents 7115c13b f8220c7f
Loading
Loading
Loading
Loading
+0 −11
Original line number Diff line number Diff line
@@ -237,17 +237,6 @@ sal_emulator (long index, unsigned long in1, unsigned long in2,
	return ((struct sal_ret_values) {status, r9, r10, r11});
}


/*
 * This is here to work around a bug in egcs-1.1.1b that causes the
 * compiler to crash (seems like a bug in the new alias analysis code.
 */
void *
id (long addr)
{
	return (void *) addr;
}

struct ia64_boot_param *
sys_fw_init (const char *args, int arglen)
{
+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ obj-y := io.o

lib-y := __divsi3.o __udivsi3.o __modsi3.o __umodsi3.o			\
	__divdi3.o __udivdi3.o __moddi3.o __umoddi3.o			\
	bitop.o checksum.o clear_page.o csum_partial_copy.o copy_page.o	\
	bitop.o checksum.o clear_page.o csum_partial_copy.o		\
	clear_user.o strncpy_from_user.o strlen_user.o strnlen_user.o	\
	flush.o ip_fast_csum.o do_csum.o				\
	memset.o strlen.o swiotlb.o
+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@
#define IO_SPACE_BASE(space)		((space) << IO_SPACE_BITS)
#define IO_SPACE_PORT(port)		((port) & (IO_SPACE_SIZE - 1))

#define IO_SPACE_SPARSE_ENCODING(p)	((((p) >> 2) << 12) | (p & 0xfff))
#define IO_SPACE_SPARSE_ENCODING(p)	((((p) >> 2) << 12) | ((p) & 0xfff))

struct io_space {
	unsigned long mmio_base;	/* base in MMIO space */