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

Commit 464662b9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze 

Pull arch/microblaze fixes from Michal Simek.

* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Fix ret_from_fork declaration
  microblaze: Do not use tlb_skip in early_printk
  microblaze: Add missing headers caused by disintegration asm/system.h
  microblaze: Fix stack usage in PAGE_SIZE copy_tofrom_user
  microblaze: Fix tlb_skip variable on noMMU system
  microblaze: Fix __futex_atomic_op macro register usage
parents 1e649afd 0dd90aa9

arch/microblaze/include/asm/cmpxchg.h

+2 −0
Original line number Original line Diff line number Diff line 
#ifndef _ASM_MICROBLAZE_CMPXCHG_H

#ifndef _ASM_MICROBLAZE_CMPXCHG_H

#define _ASM_MICROBLAZE_CMPXCHG_H

#define _ASM_MICROBLAZE_CMPXCHG_H





#include <linux/irqflags.h>



void __bad_xchg(volatile void *ptr, int size);

void __bad_xchg(volatile void *ptr, int size);





static inline unsigned long __xchg(unsigned long x, volatile void *ptr,

static inline unsigned long __xchg(unsigned long x, volatile void *ptr,

arch/microblaze/include/asm/futex.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ 
			.word	1b,4b,2b,4b;				\

			.word	1b,4b,2b,4b;				\

			.previous;"					\

			.previous;"					\

	: "=&r" (oldval), "=&r" (ret)					\

	: "=&r" (oldval), "=&r" (ret)					\

	: "b" (uaddr), "i" (-EFAULT), "r" (oparg)			\

	: "r" (uaddr), "i" (-EFAULT), "r" (oparg)			\

	);								\

	);								\

})

})

arch/microblaze/include/asm/processor.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -31,6 +31,8 @@ extern const struct seq_operations cpuinfo_op; 
/* Do necessary setup to start up a newly executed thread. */

/* Do necessary setup to start up a newly executed thread. */

void start_thread(struct pt_regs *regs, unsigned long pc, unsigned long usp);

void start_thread(struct pt_regs *regs, unsigned long pc, unsigned long usp);





extern void ret_from_fork(void);



# endif /* __ASSEMBLY__ */

# endif /* __ASSEMBLY__ */





# ifndef CONFIG_MMU

# ifndef CONFIG_MMU
@@ -143,8 +145,6 @@ static inline void exit_thread(void) 




unsigned long get_wchan(struct task_struct *p);

unsigned long get_wchan(struct task_struct *p);





extern void ret_from_fork(void);



/* The size allocated for kernel stacks. This _must_ be a power of two! */

/* The size allocated for kernel stacks. This _must_ be a power of two! */

# define KERNEL_STACK_SIZE	0x2000

# define KERNEL_STACK_SIZE	0x2000

arch/microblaze/kernel/early_printk.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -176,6 +176,7 @@ void __init remap_early_printk(void) 
	base_addr = (u32) ioremap(base_addr, PAGE_SIZE);

	base_addr = (u32) ioremap(base_addr, PAGE_SIZE);

	printk(KERN_CONT "0x%x\n", base_addr);

	printk(KERN_CONT "0x%x\n", base_addr);





#ifdef CONFIG_MMU

	/*

	/*

	 * Early console is on the top of skipped TLB entries

	 * Early console is on the top of skipped TLB entries

	 * decrease tlb_skip size ensure that hardcoded TLB entry will be

	 * decrease tlb_skip size ensure that hardcoded TLB entry will be
@@ -189,6 +190,7 @@ void __init remap_early_printk(void) 
	 *  cmp rX, orig_base_addr

	 *  cmp rX, orig_base_addr

	 */

	 */

	tlb_skip -= 1;

	tlb_skip -= 1;

#endif

}

}





void __init disable_early_printk(void)

void __init disable_early_printk(void)

arch/microblaze/kernel/setup.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -206,6 +206,7 @@ static int microblaze_debugfs_init(void) 
}

}

arch_initcall(microblaze_debugfs_init);

arch_initcall(microblaze_debugfs_init);





# ifdef CONFIG_MMU

static int __init debugfs_tlb(void)

static int __init debugfs_tlb(void)

{

{

	struct dentry *d;

	struct dentry *d;
@@ -219,6 +220,7 @@ static int __init debugfs_tlb(void) 
}

}

device_initcall(debugfs_tlb);

device_initcall(debugfs_tlb);

# endif

# endif

#endif





static int dflt_bus_notify(struct notifier_block *nb,

static int dflt_bus_notify(struct notifier_block *nb,

				unsigned long action, void *data)

				unsigned long action, void *data)