diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-03 10:12:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-03 10:12:05 -0700 |
| commit | 464662b91614188b4af9df51baaa0d6b3d89a15f (patch) | |
| tree | 0257f83b14d1bf2fac072d66bfbe60023d7fc372 /arch/microblaze/kernel/setup.c | |
| parent | 1e649afde3708012daf43ff91730595e30e6f3bb (diff) | |
| parent | 0dd90aa9d6222e12201f05c0058e8741b7f66474 (diff) | |
| download | linux-464662b91614188b4af9df51baaa0d6b3d89a15f.tar.gz linux-464662b91614188b4af9df51baaa0d6b3d89a15f.tar.xz linux-464662b91614188b4af9df51baaa0d6b3d89a15f.zip | |
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
Diffstat (limited to 'arch/microblaze/kernel/setup.c')
| -rw-r--r-- | arch/microblaze/kernel/setup.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c index 71af974aa24a..16d8dfd9094b 100644 --- a/arch/microblaze/kernel/setup.c +++ b/arch/microblaze/kernel/setup.c @@ -206,6 +206,7 @@ static int microblaze_debugfs_init(void) } arch_initcall(microblaze_debugfs_init); +# ifdef CONFIG_MMU static int __init debugfs_tlb(void) { struct dentry *d; @@ -218,6 +219,7 @@ static int __init debugfs_tlb(void) return -ENOMEM; } device_initcall(debugfs_tlb); +# endif #endif static int dflt_bus_notify(struct notifier_block *nb, |