lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Pull microblaze updates from Michal Simek:
 - Get rid of NO_MMU Kconfig
 - mmap2 fixups
 - Some minor cleanups

* tag 'microblaze-3.13-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Remove incorrect file path
  microblaze: Fix bug with mmap2 syscall MB implementation
  microblaze: Use predefined SYSCALL_DEFINE macro
  microblaze: Remove deprecated IRQF_DISABLED
  microblaze: Calculate kernel pad automatically
  microblaze: Remove unused NO_MMU Kconfig parameter
This commit is contained in:
Linus Torvalds
2013-11-12 14:28:55 +09:00
parent 0993537bff 63d7bd1b17
commit 11db81a59d
7 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
arch/microblaze/Kconfig
View File

@@ -82,11 +82,6 @@ config MMU
bool "MMU support" bool "MMU support"
default n default n
config NO_MMU
bool
depends on !MMU
default y
comment "Boot options" comment "Boot options"
config CMDLINE_BOOL config CMDLINE_BOOL
@@ -250,10 +245,6 @@ config MICROBLAZE_64K_PAGES
endchoice endchoice
config KERNEL_PAD
hex "Kernel PAD for unpacking" if ADVANCED_OPTIONS
default "0x80000" if MMU
endmenu endmenu
source "mm/Kconfig" source "mm/Kconfig"

2
arch/microblaze/boot/dts/Makefile
View File

@@ -1,6 +1,4 @@
# #
# arch/microblaze/boot/Makefile
#
obj-y += linked_dtb.o obj-y += linked_dtb.o

2
arch/microblaze/kernel/head.S
View File

@@ -176,7 +176,7 @@ _invalidate:
/* start to do TLB calculation */ /* start to do TLB calculation */
addik r12, r0, _end addik r12, r0, _end
rsub r12, r3, r12 rsub r12, r3, r12
addik r12, r12, CONFIG_KERNEL_PAD /* that's the pad */ addik r12, r12, CONFIG_LOWMEM_SIZE >> PTE_SHIFT /* that's the pad */
or r9, r0, r0 /* TLB0 = 0 */ or r9, r0, r0 /* TLB0 = 0 */
or r10, r0, r0 /* TLB1 = 0 */ or r10, r0, r0 /* TLB1 = 0 */

4
arch/microblaze/kernel/hw_exception_handler.S
View File

@@ -193,8 +193,8 @@
* - W S REG EXC * - W S REG EXC
* *
* *
* STACK FRAME STRUCTURE (for NO_MMU) * STACK FRAME STRUCTURE (for CONFIG_MMU=n)
* --------------------------------- * ----------------------------------------
* *
* +-------------+ + 0 * +-------------+ + 0
* | MSR | * | MSR |

17
arch/microblaze/kernel/sys_microblaze.c
View File

@@ -33,12 +33,23 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <asm/syscalls.h> #include <asm/syscalls.h>
asmlinkage long sys_mmap(unsigned long addr, unsigned long len, SYSCALL_DEFINE6(mmap, unsigned long, addr, unsigned long, len,
unsigned long prot, unsigned long flags, unsigned long, prot, unsigned long, flags, unsigned long, fd,
unsigned long fd, off_t pgoff) off_t, pgoff)
{ {
if (pgoff & ~PAGE_MASK) if (pgoff & ~PAGE_MASK)
return -EINVAL; return -EINVAL;
return sys_mmap_pgoff(addr, len, prot, flags, fd, pgoff >> PAGE_SHIFT); return sys_mmap_pgoff(addr, len, prot, flags, fd, pgoff >> PAGE_SHIFT);
} }
SYSCALL_DEFINE6(mmap2, unsigned long, addr, unsigned long, len,
unsigned long, prot, unsigned long, flags, unsigned long, fd,
unsigned long, pgoff)
{
if (pgoff & (~PAGE_MASK >> 12))
return -EINVAL;
return sys_mmap_pgoff(addr, len, prot, flags, fd,
pgoff >> (PAGE_SHIFT - 12));
}

2
arch/microblaze/kernel/syscall_table.S
View File

@@ -192,7 +192,7 @@ ENTRY(sys_call_table)
.long sys_ni_syscall /* reserved for streams2 */ .long sys_ni_syscall /* reserved for streams2 */
.long sys_vfork /* 190 */ .long sys_vfork /* 190 */
.long sys_getrlimit .long sys_getrlimit
.long sys_mmap_pgoff /* mmap2 */ .long sys_mmap2
.long sys_truncate64 .long sys_truncate64
.long sys_ftruncate64 .long sys_ftruncate64
.long sys_stat64 /* 195 */ .long sys_stat64 /* 195 */

2
arch/microblaze/kernel/timer.c
View File

@@ -148,7 +148,7 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id)
static struct irqaction timer_irqaction = { static struct irqaction timer_irqaction = {
.handler = timer_interrupt, .handler = timer_interrupt,
.flags = IRQF_DISABLED | IRQF_TIMER, .flags = IRQF_TIMER,
.name = "timer", .name = "timer",
.dev_id = &clockevent_xilinx_timer, .dev_id = &clockevent_xilinx_timer,
}; };