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

Commit 989d873f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  ARM: pxa: fix page table corruption on resume
  ARM: it8152: add IT8152_LAST_IRQ definition to fix build error
  ARM: pxa: PXA_ESERIES depends on FB_W100.
  ARM: 6605/1: Add missing include "asm/memory.h"
  ARM: 6540/1: Stop irqsoff trace on return to user
  ARM: 6537/1: update Nomadik, U300 and Ux500 maintainers
  ARM: 6536/1: Add missing SZ_{32,64,128}
  ARM: fix cache-feroceon-l2 after stack based kmap_atomic()
  ARM: fix cache-xsc3l2 after stack based kmap_atomic()
  ARM: get rid of kmap_high_l1_vipt()
  ARM: smp: avoid incrementing mm_users on CPU startup
  ARM: pxa: PXA_ESERIES depends on FB_W100.
parents d9a1abe4 04228460

MAINTAINERS

+16 −1
Original line number Diff line number Diff line
@@ -792,11 +792,14 @@ S: Maintained 


ARM/NOMADIK ARCHITECTURE

M:	Alessandro Rubini <rubini@unipv.it>

M:	Linus Walleij <linus.walleij@stericsson.com>

M:	STEricsson <STEricsson_nomadik_linux@list.st.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-nomadik/

F:	arch/arm/plat-nomadik/

F:	drivers/i2c/busses/i2c-nomadik.c

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git



ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT

M:	Nelson Castillo <arhuaco@freaks-unidos.net>
@@ -998,12 +1001,24 @@ F: drivers/i2c/busses/i2c-stu300.c 
F:	drivers/rtc/rtc-coh901331.c

F:	drivers/watchdog/coh901327_wdt.c

F:	drivers/dma/coh901318*

F:	drivers/mfd/ab3100*

F:	drivers/rtc/rtc-ab3100.c

F:	drivers/rtc/rtc-coh901331.c

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git



ARM/U8500 ARM ARCHITECTURE

ARM/Ux500 ARM ARCHITECTURE

M:	Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>

M:	Linus Walleij <linus.walleij@stericsson.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-ux500/

F:	drivers/dma/ste_dma40*

F:	drivers/mfd/ab3550*

F:	drivers/mfd/abx500*

F:	drivers/mfd/ab8500*

F:	drivers/mfd/stmpe*

F:	drivers/rtc/rtc-ab8500.c

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git



ARM/VFP SUPPORT

M:	Russell King <linux@arm.linux.org.uk>

arch/arm/include/asm/hardware/it8152.h

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ extern unsigned long it8152_base_address; 
  IT8152_PD_IRQ(0)  Audio controller (ACR)

 */

#define IT8152_IRQ(x)   (IRQ_BOARD_START + (x))

#define IT8152_LAST_IRQ	(IRQ_BOARD_START + 40)



/* IRQ-sources in 3 groups - local devices, LPC (serial), and external PCI */

#define IT8152_LD_IRQ_COUNT     9

arch/arm/include/asm/highmem.h

+0 −3
Original line number Diff line number Diff line
@@ -25,9 +25,6 @@ extern void *kmap_high(struct page *page); 
extern void *kmap_high_get(struct page *page);

extern void kunmap_high(struct page *page);



extern void *kmap_high_l1_vipt(struct page *page, pte_t *saved_pte);

extern void kunmap_high_l1_vipt(struct page *page, pte_t saved_pte);



/*

 * The following functions are already defined by <linux/highmem.h>

 * when CONFIG_HIGHMEM is not set.

arch/arm/include/asm/sizes.h

+3 −3
Original line number Diff line number Diff line
@@ -13,9 +13,6 @@ 
 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */

/* DO NOT EDIT!! - this file automatically generated

 *                 from .s file by awk -f s2h.awk

 */

/*  Size definitions

 *  Copyright (C) ARM Limited 1998. All rights reserved.

 */
@@ -25,6 +22,9 @@ 


/* handy sizes */

#define SZ_16				0x00000010

#define SZ_32				0x00000020

#define SZ_64				0x00000040

#define SZ_128				0x00000080

#define SZ_256				0x00000100

#define SZ_512				0x00000200

arch/arm/include/asm/system.h

+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ extern unsigned int user_debug; 
#define rmb()		dmb()

#define wmb()		mb()

#else

#include <asm/memory.h>

#define mb()	do { if (arch_is_coherent()) dmb(); else barrier(); } while (0)

#define rmb()	do { if (arch_is_coherent()) dmb(); else barrier(); } while (0)

#define wmb()	do { if (arch_is_coherent()) dmb(); else barrier(); } while (0)