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

Commit f0a679af authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm 

Pull ARM fixes from Russell King:
 "Another set of small fixes for ARM, covering various areas.

  Laura fixed a long standing issue with virt_addr_valid() failing to
  handle holes in memory.  Steve found a problem with dcache flushing
  for compound pages.  I fixed another bug in footbridge stuff causing
  time to tick slowly, and also a problem with the AES code which can
  cause linker errors.

  A patch from Rob which fixes Xen problems induced by a lack of
  consistency in our naming of ioremap_cache() - which thankfully has
  very few users"

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: 7933/1: rename ioremap_cached to ioremap_cache
  ARM: fix "bad mode in ... handler" message for undefined instructions
  CRYPTO: Fix more AES build errors
  ARM: 7931/1: Correct virt_addr_valid
  ARM: 7923/1: mm: fix dcache flush logic for compound high pages
  ARM: fix footbridge clockevent device
parents d11739e6 0a5ccc86

arch/arm/crypto/aesbs-core.S_shipped

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
# define VFP_ABI_FRAME	0

# define BSAES_ASM_EXTENDED_KEY

# define XTS_CHAIN_TWEAK

# define __ARM_ARCH__ __LINUX_ARM_ARCH__

# define __ARM_ARCH__	7

#endif



#ifdef __thumb__

arch/arm/crypto/bsaes-armv7.pl

+1 −1
Original line number Diff line number Diff line
@@ -701,7 +701,7 @@ $code.=<<___; 
# define VFP_ABI_FRAME	0

# define BSAES_ASM_EXTENDED_KEY

# define XTS_CHAIN_TWEAK

# define __ARM_ARCH__ __LINUX_ARM_ARCH__

# define __ARM_ARCH__	7

#endif



#ifdef __thumb__

arch/arm/include/asm/io.h

+1 −1
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ extern void _memset_io(volatile void __iomem *, int, size_t); 
 */

#define ioremap(cookie,size)		__arm_ioremap((cookie), (size), MT_DEVICE)

#define ioremap_nocache(cookie,size)	__arm_ioremap((cookie), (size), MT_DEVICE)

#define ioremap_cached(cookie,size)	__arm_ioremap((cookie), (size), MT_DEVICE_CACHED)

#define ioremap_cache(cookie,size)	__arm_ioremap((cookie), (size), MT_DEVICE_CACHED)

#define ioremap_wc(cookie,size)		__arm_ioremap((cookie), (size), MT_DEVICE_WC)

#define iounmap				__arm_iounmap

arch/arm/include/asm/memory.h

+2 −1
Original line number Diff line number Diff line
@@ -347,7 +347,8 @@ static inline __deprecated void *bus_to_virt(unsigned long x) 
#define ARCH_PFN_OFFSET		PHYS_PFN_OFFSET



#define virt_to_page(kaddr)	pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)

#define virt_addr_valid(kaddr)	((unsigned long)(kaddr) >= PAGE_OFFSET && (unsigned long)(kaddr) < (unsigned long)high_memory)

#define virt_addr_valid(kaddr)	(((unsigned long)(kaddr) >= PAGE_OFFSET && (unsigned long)(kaddr) < (unsigned long)high_memory) \

					&& pfn_valid(__pa(kaddr) >> PAGE_SHIFT) )



#endif

arch/arm/include/asm/xen/page.h

+1 −1
Original line number Diff line number Diff line
@@ -117,6 +117,6 @@ static inline bool set_phys_to_machine(unsigned long pfn, unsigned long mfn) 
	return __set_phys_to_machine(pfn, mfn);

}



#define xen_remap(cookie, size) ioremap_cached((cookie), (size));

#define xen_remap(cookie, size) ioremap_cache((cookie), (size));



#endif /* _ASM_ARM_XEN_PAGE_H */