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

Commit 5047f09b authored by David Woodhouse's avatar David Woodhouse
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 



Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parents c0f1fe00 5528e568

CREDITS

+2 −8
Original line number Original line Diff line number Diff line
@@ -1194,15 +1194,9 @@ S: Brecksville, OH 44141-1334 
S: USA

S: USA





N: Tristan Greaves

N: Tristan Greaves

E: Tristan.Greaves@icl.com

E: tristan@extricate.org

E: tmg296@ecs.soton.ac.uk

W: http://www.extricate.org/

W: http://www.ecs.soton.ac.uk/~tmg296

D: Miscellaneous ipv4 sysctl patches

D: Miscellaneous ipv4 sysctl patches

S: 15 Little Mead

S: Denmead

S: Hampshire

S: PO7 6HS

S: United Kingdom





N: Michael A. Griffith

N: Michael A. Griffith

E: grif@cs.ucr.edu

E: grif@cs.ucr.edu

arch/arm/Kconfig

+0 −2
Original line number Original line Diff line number Diff line
@@ -150,8 +150,6 @@ config ARCH_IOP3XX 




config ARCH_IXP4XX

config ARCH_IXP4XX

	bool "IXP4xx-based"

	bool "IXP4xx-based"

	select DMABOUNCE

	select PCI

	help

	help

	  Support for Intel's IXP4XX (XScale) family of processors.

	  Support for Intel's IXP4XX (XScale) family of processors.

arch/arm/boot/compressed/misc.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -38,10 +38,10 @@ static void icedcc_putc(int ch) 
		if (--i < 0)

		if (--i < 0)

			return;

			return;





		asm("mrc p14, 0, %0, c0, c0, 0" : "=r" (status));

		asm volatile ("mrc p14, 0, %0, c0, c0, 0" : "=r" (status));

	} while (status & 2);

	} while (status & 2);





	asm("mcr p15, 0, %0, c1, c0, 0" : : "r" (ch));

	asm("mcr p14, 0, %0, c1, c0, 0" : : "r" (ch));

}

}





#define putc(ch)	icedcc_putc(ch)

#define putc(ch)	icedcc_putc(ch)

arch/arm/kernel/asm-offsets.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -95,5 +95,11 @@ int main(void) 
  DEFINE(SYS_ERROR0,		0x9f0000);

  DEFINE(SYS_ERROR0,		0x9f0000);

  BLANK();

  BLANK();

  DEFINE(SIZEOF_MACHINE_DESC,	sizeof(struct machine_desc));

  DEFINE(SIZEOF_MACHINE_DESC,	sizeof(struct machine_desc));

  DEFINE(MACHINFO_TYPE,		offsetof(struct machine_desc, nr));

  DEFINE(MACHINFO_NAME,		offsetof(struct machine_desc, name));

  DEFINE(MACHINFO_PHYSIO,	offsetof(struct machine_desc, phys_io));

  DEFINE(MACHINFO_PGOFFIO,	offsetof(struct machine_desc, io_pg_offst));

  DEFINE(PROCINFO_INITFUNC,	offsetof(struct proc_info_list, __cpu_flush));

  DEFINE(PROCINFO_MMUFLAGS,	offsetof(struct proc_info_list, __cpu_mmu_flags));

  return 0; 

  return 0; 

}
 
}

arch/arm/kernel/head-nommu.S

+1 −3
Original line number Original line Diff line number Diff line
@@ -20,12 +20,10 @@ 
#include <asm/mach-types.h>

#include <asm/mach-types.h>

#include <asm/procinfo.h>

#include <asm/procinfo.h>

#include <asm/ptrace.h>

#include <asm/ptrace.h>

#include <asm/asm-offsets.h>

#include <asm/thread_info.h>

#include <asm/thread_info.h>

#include <asm/system.h>

#include <asm/system.h>





#define PROCINFO_INITFUNC       12

#define MACHINFO_TYPE		0



/*

/*

 * Kernel startup entry point.

 * Kernel startup entry point.

 * ---------------------------

 * ---------------------------