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

Commit 738b52bb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'microblaze-3.14-rc3' of git://git.monstr.eu/linux-2.6-microblaze 

Pull microblaze fixes from Michal Simek:
 - Fix two compilation issues - HZ, readq/writeq
 - Fix stack protection support

* tag 'microblaze-3.14-rc3' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Fix a typo when disabling stack protection
  microblaze: Define readq and writeq IO helper function
  microblaze: Fix missing HZ macro
parents a87af778 a49f56ee

arch/microblaze/include/asm/delay.h

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
#ifndef _ASM_MICROBLAZE_DELAY_H

#define _ASM_MICROBLAZE_DELAY_H



#include <linux/param.h>



extern inline void __delay(unsigned long loops)

{

	asm volatile ("# __delay		\n\t"		\

arch/microblaze/include/asm/io.h

+6 −0
Original line number Diff line number Diff line
@@ -89,6 +89,11 @@ static inline unsigned int readl(const volatile void __iomem *addr) 
{

	return le32_to_cpu(*(volatile unsigned int __force *)addr);

}

#define readq readq

static inline u64 readq(const volatile void __iomem *addr)

{

	return le64_to_cpu(__raw_readq(addr));

}

static inline void writeb(unsigned char v, volatile void __iomem *addr)

{

	*(volatile unsigned char __force *)addr = v;
@@ -101,6 +106,7 @@ static inline void writel(unsigned int v, volatile void __iomem *addr) 
{

	*(volatile unsigned int __force *)addr = cpu_to_le32(v);

}

#define writeq(b, addr) __raw_writeq(cpu_to_le64(b), addr)



/* ioread and iowrite variants. thease are for now same as __raw_

 * variants of accessors. we might check for endianess in the feature

arch/microblaze/kernel/head.S

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ real_start: 
	mts	rmsr, r0

/* Disable stack protection from bootloader */

	mts	rslr, r0

	addi	r8, r0, 0xFFFFFFF

	addi	r8, r0, 0xFFFFFFFF

	mts	rshr, r8

/*

 * According to Xilinx, msrclr instruction behaves like 'mfs rX,rpc'