Skip to content

Commit 738b52b

Browse files
committed
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
2 parents a87af77 + a49f56e commit 738b52b

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

arch/microblaze/include/asm/delay.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
#ifndef _ASM_MICROBLAZE_DELAY_H
1414
#define _ASM_MICROBLAZE_DELAY_H
1515

16+
#include <linux/param.h>
17+
1618
extern inline void __delay(unsigned long loops)
1719
{
1820
asm volatile ("# __delay \n\t" \

arch/microblaze/include/asm/io.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,11 @@ static inline unsigned int readl(const volatile void __iomem *addr)
8989
{
9090
return le32_to_cpu(*(volatile unsigned int __force *)addr);
9191
}
92+
#define readq readq
93+
static inline u64 readq(const volatile void __iomem *addr)
94+
{
95+
return le64_to_cpu(__raw_readq(addr));
96+
}
9297
static inline void writeb(unsigned char v, volatile void __iomem *addr)
9398
{
9499
*(volatile unsigned char __force *)addr = v;
@@ -101,6 +106,7 @@ static inline void writel(unsigned int v, volatile void __iomem *addr)
101106
{
102107
*(volatile unsigned int __force *)addr = cpu_to_le32(v);
103108
}
109+
#define writeq(b, addr) __raw_writeq(cpu_to_le64(b), addr)
104110

105111
/* ioread and iowrite variants. thease are for now same as __raw_
106112
* variants of accessors. we might check for endianess in the feature

arch/microblaze/kernel/head.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ real_start:
6666
mts rmsr, r0
6767
/* Disable stack protection from bootloader */
6868
mts rslr, r0
69-
addi r8, r0, 0xFFFFFFF
69+
addi r8, r0, 0xFFFFFFFF
7070
mts rshr, r8
7171
/*
7272
* According to Xilinx, msrclr instruction behaves like 'mfs rX,rpc'

0 commit comments

Comments
 (0)