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

Commit 98368ab4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'microblaze-3.20-rc1' of git://git.monstr.eu/linux-2.6-microblaze 

Pull Microblaze pupdates from Michal Simek:
 - Remove various compilation errors
 - Various code cleanup patches
 - Add missing MB versions/architectures for autodetection

* tag 'microblaze-3.20-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Remove *.dtb files in make clean
  microblaze: whitespace fix
  microblaze/uaccess: fix sparse errors
  microblaze: intc: Reformat output
  microblaze: intc: Refactor DT sanity check
  microblaze: intc: Don't override error codes
  microblaze: Add target architecture
  microblaze: Add missing PVR version codes
  microblaze: Fix variable types to remove W=1 warning
  microblaze: Use unsigned type for limit comparison in cache.c
  microblaze: Use unsigned type for proper comparison in cpuinfo*.c
  microblaze: Use unsigned type for "for" loop because of comparison-kgdb.c
  microblaze: Change extern inline to static inline
  microblaze: Mark get_frame_size as static
  microblaze: Use unsigned return type in do_syscall_trace_enter
  microblaze: Declare microblaze_kgdb_break in header
  microblaze: Remove unused prom header from reset.c
  microblaze: Remove unused prom_parse.c
  microblaze: Wire-up execveat syscall
  microblaze: Use empty asm-generic/linkage.h
parents ab0475df a01d37d9

arch/microblaze/boot/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -34,5 +34,4 @@ $(obj)/simpleImage.%: vmlinux FORCE 
	$(call if_changed,strip)

	@echo 'Kernel: $@ is ready' ' (#'`cat .version`')'





clean-files += simpleImage.*.unstrip linux.bin.ub
 
clean-files += simpleImage.*.unstrip linux.bin.ub dts/*.dtb

arch/microblaze/boot/dts/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -16,5 +16,3 @@ quiet_cmd_cp = CP $< $@$2 


# Rule to build device tree blobs

DTC_FLAGS := -p 1024
 


clean-files += *.dtb

arch/microblaze/include/asm/delay.h

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 


#include <linux/param.h>



extern inline void __delay(unsigned long loops)

static inline void __delay(unsigned long loops)

{

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

			"1: addi	%0, %0, -1\t\n"		\
@@ -43,7 +43,7 @@ extern inline void __delay(unsigned long loops) 


extern unsigned long loops_per_jiffy;



extern inline void __udelay(unsigned int x)

static inline void __udelay(unsigned int x)

{



	unsigned long long tmp =

arch/microblaze/include/asm/kgdb.h

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ static inline void arch_kgdb_breakpoint(void) 
	__asm__ __volatile__("brki r16, 0x18;");

}



struct pt_regs;

asmlinkage void microblaze_kgdb_break(struct pt_regs *regs);



#endif /* __ASSEMBLY__ */

#endif /* __MICROBLAZE_KGDB_H__ */

#endif /* __KERNEL__ */

arch/microblaze/include/asm/linkage.h

+1 −15
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2006 Atmark Techno, Inc.

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License. See the file "COPYING" in the main directory of this archive

 * for more details.

 */



#ifndef _ASM_MICROBLAZE_LINKAGE_H

#define _ASM_MICROBLAZE_LINKAGE_H



#define __ALIGN		.align 4

#define __ALIGN_STR	".align 4"



#endif /* _ASM_MICROBLAZE_LINKAGE_H */
 
#include <asm-generic/linkage.h>