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

Commit 6f74b184 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.infradead.org/~dwmw2/dwmw2-2.6.27 

* git://git.infradead.org/~dwmw2/dwmw2-2.6.27:
  Revert "[ARM] use the new byteorder headers"
  Fix conditional export of kvh.h and a.out.h to userspace.
  [MTD] [NAND] tmio_nand: fix base address programming
parents b693ffe6 b35de672

arch/arm/include/asm/byteorder.h

+14 −11
Original line number Original line Diff line number Diff line
@@ -18,15 +18,7 @@ 
#include <linux/compiler.h>

#include <linux/compiler.h>

#include <asm/types.h>

#include <asm/types.h>





#ifdef __ARMEB__

static inline __attribute_const__ __u32 ___arch__swab32(__u32 x)

# define __BIG_ENDIAN

#else

# define __LITTLE_ENDIAN

#endif



#define __SWAB_64_THRU_32__



static inline __attribute_const__ __u32 __arch_swab32(__u32 x)

{

{

	__u32 t;

	__u32 t;
@@ -48,8 +40,19 @@ static inline __attribute_const__ __u32 __arch_swab32(__u32 x) 




	return x;

	return x;

}

}

#define __arch_swab32 __arch_swab32





#include <linux/byteorder.h>

#define __arch__swab32(x) ___arch__swab32(x)



#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)

#  define __BYTEORDER_HAS_U64__

#  define __SWAB_64_THRU_32__

#endif





#ifdef __ARMEB__

#include <linux/byteorder/big_endian.h>

#else

#include <linux/byteorder/little_endian.h>

#endif

#endif



#endif

drivers/mtd/nand/tmio_nand.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -109,7 +109,7 @@ struct tmio_nand { 




	void __iomem *ccr;

	void __iomem *ccr;

	void __iomem *fcr;

	void __iomem *fcr;

	unsigned long fcr_phys;

	unsigned long fcr_base;





	unsigned int irq;

	unsigned int irq;
@@ -316,8 +316,8 @@ static int tmio_hw_init(struct platform_device *dev, struct tmio_nand *tmio) 
	tmio_iowrite8(0x81, tmio->ccr + CCR_ICC);

	tmio_iowrite8(0x81, tmio->ccr + CCR_ICC);





	/* (10h)BaseAddress    0x1000 spba.spba2 */

	/* (10h)BaseAddress    0x1000 spba.spba2 */

	tmio_iowrite16(tmio->fcr_phys, tmio->ccr + CCR_BASE);

	tmio_iowrite16(tmio->fcr_base, tmio->ccr + CCR_BASE);

	tmio_iowrite16(tmio->fcr_phys >> 16, tmio->ccr + CCR_BASE + 16);

	tmio_iowrite16(tmio->fcr_base >> 16, tmio->ccr + CCR_BASE + 2);





	/* (04h)Command Register I/O spcmd */

	/* (04h)Command Register I/O spcmd */

	tmio_iowrite8(0x02, tmio->ccr + CCR_COMMAND);

	tmio_iowrite8(0x02, tmio->ccr + CCR_COMMAND);
@@ -395,7 +395,7 @@ static int tmio_probe(struct platform_device *dev) 
		goto err_iomap_ccr;

		goto err_iomap_ccr;

	}

	}





	tmio->fcr_phys = (unsigned long)fcr->start;

	tmio->fcr_base = fcr->start & 0xfffff;

	tmio->fcr = ioremap(fcr->start, fcr->end - fcr->start + 1);

	tmio->fcr = ioremap(fcr->start, fcr->end - fcr->start + 1);

	if (!tmio->fcr) {

	if (!tmio->fcr) {

		retval = -EIO;

		retval = -EIO;

include/asm-generic/Kbuild.asm

+4 −2
Original line number Original line Diff line number Diff line 
ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/kvm.h),)

ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h \

      		  $(srctree)/include/asm-$(SRCARCH)/kvm.h),)

header-y  += kvm.h

header-y  += kvm.h

endif

endif





ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/a.out.h),)

ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h \

      		  $(srctree)/include/asm-$(SRCARCH)/a.out.h),)

unifdef-y += a.out.h

unifdef-y += a.out.h

endif

endif

unifdef-y += auxvec.h

unifdef-y += auxvec.h

include/linux/Kbuild

+4 −2
Original line number Original line Diff line number Diff line
@@ -167,7 +167,8 @@ unifdef-y += acct.h 
unifdef-y += adb.h

unifdef-y += adb.h

unifdef-y += adfs_fs.h

unifdef-y += adfs_fs.h

unifdef-y += agpgart.h

unifdef-y += agpgart.h

ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/a.out.h),)

ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h \

      		  $(srctree)/include/asm-$(SRCARCH)/a.out.h),)

unifdef-y += a.out.h

unifdef-y += a.out.h

endif

endif

unifdef-y += apm_bios.h

unifdef-y += apm_bios.h
@@ -258,7 +259,8 @@ unifdef-y += kd.h 
unifdef-y += kernelcapi.h

unifdef-y += kernelcapi.h

unifdef-y += kernel.h

unifdef-y += kernel.h

unifdef-y += keyboard.h

unifdef-y += keyboard.h

ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/kvm.h),)

ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h \

      		  $(srctree)/include/asm-$(SRCARCH)/kvm.h),)

unifdef-y += kvm.h

unifdef-y += kvm.h

endif

endif

unifdef-y += llc.h

unifdef-y += llc.h