diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-10 18:57:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-10 18:57:15 -0800 |
| commit | 29afc4e9a408f2304e09c6dd0dbcfbd2356d0faa (patch) | |
| tree | b4065a69fc2baa5f721b9e3ca05e3934e1ea6693 /arch | |
| parent | 1d9c5d79e6e4385aea6f69c23ba543717434ed70 (diff) | |
| parent | edb0ec0725bb9797ded0deaf172a6795e43795c8 (diff) | |
| download | op-kernel-dev-29afc4e9a408f2304e09c6dd0dbcfbd2356d0faa.zip op-kernel-dev-29afc4e9a408f2304e09c6dd0dbcfbd2356d0faa.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree changes from Jiri Kosina:
"Patches from trivial.git that keep the world turning around.
Mostly documentation and comment fixes, and a two corner-case code
fixes from Alan Cox"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
kexec, Kconfig: spell "architecture" properly
mm: fix cleancache debugfs directory path
blackfin: mach-common: ints-priority: remove unused function
doubletalk: probe failure causes OOPS
ARM: cache-l2x0.c: Make it clear that cache-l2x0 handles L310 cache controller
msdos_fs.h: fix 'fields' in comment
scsi: aic7xxx: fix comment
ARM: l2c: fix comment
ibmraid: fix writeable attribute with no store method
dynamic_debug: fix comment
doc: usbmon: fix spelling s/unpriviledged/unprivileged/
x86: init_mem_mapping(): use capital BIOS in comment
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mm/cache-l2x0.c | 4 | ||||
| -rw-r--r-- | arch/blackfin/mach-common/ints-priority.c | 8 | ||||
| -rw-r--r-- | arch/x86/mm/init.c | 2 |
3 files changed, 3 insertions, 11 deletions
diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c index 5e65ca8..c7fc009 100644 --- a/arch/arm/mm/cache-l2x0.c +++ b/arch/arm/mm/cache-l2x0.c @@ -1,5 +1,5 @@ /* - * arch/arm/mm/cache-l2x0.c - L210/L220 cache controller support + * arch/arm/mm/cache-l2x0.c - L210/L220/L310 cache controller support * * Copyright (C) 2007 ARM Limited * @@ -979,7 +979,7 @@ static int __init l2x0_cache_size_of_parse(const struct device_node *np, /* All these l2 caches have the same line = block size actually */ if (!line_size) { if (block_size) { - /* If linesize if not given, it is equal to blocksize */ + /* If linesize is not given, it is equal to blocksize */ line_size = block_size; } else { /* Fall back to known size */ diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c index dd2af74..7236bdf 100644 --- a/arch/blackfin/mach-common/ints-priority.c +++ b/arch/blackfin/mach-common/ints-priority.c @@ -429,14 +429,6 @@ static void init_software_driven_irq(void) bfin_sec_enable_ssi(37); } -void bfin_sec_resume(void) -{ - bfin_write_SEC_SCI(0, SEC_CCTL, SEC_CCTL_RESET); - udelay(100); - bfin_write_SEC_GCTL(SEC_GCTL_EN); - bfin_write_SEC_SCI(0, SEC_CCTL, SEC_CCTL_EN | SEC_CCTL_NMI_EN); -} - void handle_sec_sfi_fault(uint32_t gstat) { diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index 079c3b6..649da47 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -608,7 +608,7 @@ void __init init_mem_mapping(void) * * * On x86, access has to be given to the first megabyte of ram because that area - * contains bios code and data regions used by X and dosemu and similar apps. + * contains BIOS code and data regions used by X and dosemu and similar apps. * Access has to be given to non-kernel-ram areas as well, these contain the PCI * mmio resources as well as potential bios/acpi data regions. */ |
