Commit 445c682b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: (35 commits)
  microblaze: Support word copying in copy_tofrom_user
  microblaze: Print early printk information to log buffer
  microblaze: head.S typo fix
  microblaze: Use MICROBLAZE_TLB_SIZE in asm code
  microblaze: Kconfig Fix - pci
  microblaze: Adding likely macros
  microblaze: Add .type and .size to ASM functions
  microblaze: Fix TLB macros
  microblaze: Use instruction with delay slot
  microblaze: Remove additional resr and rear loading
  microblaze: Change register usage for ESR and EAR
  microblaze: Prepare work for optimization in exception code
  microblaze: Add DEBUG option
  microblaze: Support systems without lmb bram
  microblaze: uaccess: Sync strlen, strnlen, copy_to/from_user
  microblaze: uaccess: Unify __copy_tofrom_user
  microblaze: uaccess: Move functions to generic location
  microblaze: uaccess: Fix put_user for noMMU
  microblaze: uaccess: Fix get_user macro for noMMU
  microblaze: uaccess: fix clear_user for noMMU kernel
  ...
parents c7681f46 ca3865ba

arch/microblaze/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -75,9 +75,6 @@ config LOCKDEP_SUPPORT 
config HAVE_LATENCYTOP_SUPPORT

	def_bool y



config PCI

	def_bool n



config DTC

	def_bool y

arch/microblaze/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ define archhelp 
  echo '* linux.bin    - Create raw binary'

  echo '  linux.bin.gz - Create compressed raw binary'

  echo '  simpleImage.<dt> - ELF image with $(arch)/boot/dts/<dt>.dts linked in'

  echo '                   - stripped elf with fdt blob

  echo '                   - stripped elf with fdt blob'

  echo '  simpleImage.<dt>.unstrip - full ELF image with fdt blob'

  echo '  *_defconfig      - Select default config from arch/microblaze/configs'

  echo ''
@@ -94,3 +94,5 @@ define archhelp 
  echo '  name of a dts file from the arch/microblaze/boot/dts/ directory'

  echo '  (minus the .dts extension).'

endef



MRPROPER_FILES += $(boot)/simpleImage.*

arch/microblaze/boot/Makefile

+1 −5
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ $(obj)/system.dtb: $(obj)/$(DTB).dtb 
endif



$(obj)/linux.bin: vmlinux FORCE

	[ -n $(CONFIG_INITRAMFS_SOURCE) ] && [ ! -e $(CONFIG_INITRAMFS_SOURCE) ] && \

	touch $(CONFIG_INITRAMFS_SOURCE) || echo "No CPIO image"

	$(call if_changed,objcopy)

	$(call if_changed,uimage)

	@echo 'Kernel: $@ is ready' ' (#'`cat .version`')'
@@ -62,6 +60,4 @@ quiet_cmd_dtc = DTC $@ 
$(obj)/%.dtb: $(dtstree)/%.dts FORCE

	$(call if_changed,dtc)



clean-kernel += linux.bin linux.bin.gz simpleImage.*



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

arch/microblaze/include/asm/processor.h

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include <asm/ptrace.h>

#include <asm/setup.h>

#include <asm/registers.h>

#include <asm/segment.h>

#include <asm/entry.h>

#include <asm/current.h>

arch/microblaze/include/asm/segment.h

deleted100644 → 0
+0 −49
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2008-2009 Michal Simek <monstr@monstr.eu>

 * Copyright (C) 2008-2009 PetaLogix

 * 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_SEGMENT_H

#define _ASM_MICROBLAZE_SEGMENT_H



# ifndef __ASSEMBLY__



typedef struct {

	unsigned long seg;

} mm_segment_t;



/*

 * On Microblaze the fs value is actually the top of the corresponding

 * address space.

 *

 * The fs value determines whether argument validity checking should be

 * performed or not. If get_fs() == USER_DS, checking is performed, with

 * get_fs() == KERNEL_DS, checking is bypassed.

 *

 * For historical reasons, these macros are grossly misnamed.

 *

 * For non-MMU arch like Microblaze, KERNEL_DS and USER_DS is equal.

 */

# define MAKE_MM_SEG(s)       ((mm_segment_t) { (s) })



#  ifndef CONFIG_MMU

#  define KERNEL_DS	MAKE_MM_SEG(0)

#  define USER_DS	KERNEL_DS

#  else

#  define KERNEL_DS	MAKE_MM_SEG(0xFFFFFFFF)

#  define USER_DS	MAKE_MM_SEG(TASK_SIZE - 1)

#  endif



# define get_ds()	(KERNEL_DS)

# define get_fs()	(current_thread_info()->addr_limit)

# define set_fs(val)	(current_thread_info()->addr_limit = (val))



# define segment_eq(a, b)	((a).seg == (b).seg)



# endif /* __ASSEMBLY__ */

#endif /* _ASM_MICROBLAZE_SEGMENT_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE