Skip to content

Commit f949c0e

Browse files
author
Russell King
committed
Merge branch 'master' into devel
2 parents 119c4b1 + 92d2040 commit f949c0e

File tree

18 files changed

+41
-25
lines changed

18 files changed

+41
-25
lines changed

‎arch/arm/Kconfig

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1421,6 +1421,17 @@ config CMDLINE
14211421
time by entering them here. As a minimum, you should specify the
14221422
memory size and the root device (e.g., mem=64M root=/dev/nfs).
14231423

1424+
config CMDLINE_FORCE
1425+
bool "Always use the default kernel command string"
1426+
depends on CMDLINE != ""
1427+
help
1428+
Always use the default kernel command string, even if the boot
1429+
loader passes other arguments to the kernel.
1430+
This is useful if you cannot or don't want to change the
1431+
command-line options your boot loader passes to the kernel.
1432+
1433+
If unsure, say N.
1434+
14241435
config XIP_KERNEL
14251436
bool "Kernel Execute-In-Place from ROM"
14261437
depends on !ZBOOT_ROM

‎arch/arm/boot/bootp/bootp.lds

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ SECTIONS
1919
initrd_size = initrd_end - initrd_start;
2020
_etext = .;
2121
}
22-
22+
2323
.stab 0 : { *(.stab) }
2424
.stabstr 0 : { *(.stabstr) }
2525
.stab.excl 0 : { *(.stab.excl) }

‎arch/arm/kernel/setup.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -593,13 +593,15 @@ static int __init parse_tag_revision(const struct tag *tag)
593593

594594
__tagtable(ATAG_REVISION, parse_tag_revision);
595595

596+
#ifndef CONFIG_CMDLINE_FORCE
596597
static int __init parse_tag_cmdline(const struct tag *tag)
597598
{
598599
strlcpy(default_command_line, tag->u.cmdline.cmdline, COMMAND_LINE_SIZE);
599600
return 0;
600601
}
601602

602603
__tagtable(ATAG_CMDLINE, parse_tag_cmdline);
604+
#endif /* CONFIG_CMDLINE_FORCE */
603605

604606
/*
605607
* Scan the tag table for this tag, and call its parse function.

‎arch/arm/kernel/unwind.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
* http://infocenter.arm.com/help/topic/com.arm.doc.subset.swdev.abi/index.html
2727
*/
2828

29+
#ifndef __CHECKER__
2930
#if !defined (__ARM_EABI__)
3031
#warning Your compiler does not have EABI support.
3132
#warning ARM unwind is known to compile only with EABI compilers.
@@ -34,6 +35,7 @@
3435
#warning Your compiler is too buggy; it is known to not compile ARM unwind support.
3536
#warning Change compiler or disable ARM_UNWIND option.
3637
#endif
38+
#endif /* __CHECKER__ */
3739

3840
#include <linux/kernel.h>
3941
#include <linux/init.h>

‎arch/arm/mach-at91/board-sam9m10g45ek.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include <linux/leds.h>
2626
#include <linux/clk.h>
2727

28-
#include <mach/hardware.h>
2928
#include <video/atmel_lcdc.h>
3029

3130
#include <asm/setup.h>

‎arch/arm/mach-clps711x/Makefile.boot

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# The standard locations for stuff on CLPS711x type processors
2-
zreladdr-y := 0xc0028000
2+
zreladdr-y := 0xc0028000
33
params_phys-y := 0xc0000100
44
# Should probably have some agreement on these...
55
initrd_phys-$(CONFIG_ARCH_P720T) := 0xc0400000
66
initrd_phys-$(CONFIG_ARCH_CDB89712) := 0x00700000
7-

‎arch/arm/mach-footbridge/ebsa285-pci.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ static int __init ebsa285_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
2020
if (dev->vendor == PCI_VENDOR_ID_CONTAQ &&
2121
dev->device == PCI_DEVICE_ID_CONTAQ_82C693)
2222
switch (PCI_FUNC(dev->devfn)) {
23-
case 1: return 14;
24-
case 2: return 15;
25-
case 3: return 12;
23+
case 1: return 14;
24+
case 2: return 15;
25+
case 3: return 12;
2626
}
2727

2828
return irqmap_ebsa285[(slot + pin) & 3];

‎arch/arm/mach-h720x/common.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
*/
1515

1616
extern unsigned long h720x_gettimeoffset(void);
17-
extern void __init h720x_init_irq (void);
17+
extern void __init h720x_init_irq(void);
1818
extern void __init h720x_map_io(void);
1919

2020
#ifdef CONFIG_ARCH_H7202
2121
extern struct sys_timer h7202_timer;
2222
extern void __init init_hw_h7202(void);
23-
extern void __init h7202_init_irq (void);
23+
extern void __init h7202_init_irq(void);
2424
extern void __init h7202_init_time(void);
2525
#endif
2626

‎arch/arm/mach-msm/board-msm7x27.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include <linux/input.h>
2121
#include <linux/io.h>
2222
#include <linux/delay.h>
23-
#include <linux/bootmem.h>
2423
#include <linux/power_supply.h>
2524

2625
#include <mach/hardware.h>

‎arch/arm/mach-msm/board-msm7x30.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include <linux/gpio.h>
2121
#include <linux/platform_device.h>
2222
#include <linux/delay.h>
23-
#include <linux/bootmem.h>
2423
#include <linux/io.h>
2524
#include <linux/smsc911x.h>
2625

‎arch/arm/mach-msm/board-qsd8x50.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include <linux/irq.h>
2020
#include <linux/gpio.h>
2121
#include <linux/platform_device.h>
22-
#include <linux/bootmem.h>
2322
#include <linux/delay.h>
2423

2524
#include <asm/mach-types.h>

‎arch/arm/mach-mx2/devices.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -478,8 +478,8 @@ int __init mxc_register_gpios(void)
478478
#ifdef CONFIG_MACH_MX21
479479
static struct resource mx21_usbhc_resources[] = {
480480
{
481-
.start = MX21_BASE_ADDR,
482-
.end = MX21_BASE_ADDR + 0x1FFF,
481+
.start = MX21_USBOTG_BASE_ADDR,
482+
.end = MX21_USBOTG_BASE_ADDR + SZ_8K - 1,
483483
.flags = IORESOURCE_MEM,
484484
},
485485
{

‎arch/arm/mach-sa1100/leds.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* linux/arch/arm/mach-sa1100/leds.c
33
*
44
* SA1100 LEDs dispatcher
5-
*
5+
*
66
* Copyright (C) 2001 Nicolas Pitre
77
*/
88
#include <linux/compiler.h>
@@ -18,10 +18,10 @@ sa1100_leds_init(void)
1818
{
1919
if (machine_is_assabet())
2020
leds_event = assabet_leds_event;
21-
if (machine_is_consus())
22-
leds_event = consus_leds_event;
21+
if (machine_is_consus())
22+
leds_event = consus_leds_event;
2323
if (machine_is_badge4())
24-
leds_event = badge4_leds_event;
24+
leds_event = badge4_leds_event;
2525
if (machine_is_brutus())
2626
leds_event = brutus_leds_event;
2727
if (machine_is_cerf())

‎arch/arm/mach-shark/pci.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,19 @@
1616
static int __init shark_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
1717
{
1818
if (dev->bus->number == 0)
19-
if (dev->devfn == 0) return 255;
20-
else return 11;
21-
else return 255;
19+
if (dev->devfn == 0)
20+
return 255;
21+
else
22+
return 11;
23+
else
24+
return 255;
2225
}
2326

2427
extern void __init via82c505_preinit(void);
2528

2629
static struct hw_pci shark_pci __initdata = {
2730
.setup = via82c505_setup,
28-
.swizzle = pci_std_swizzle,
31+
.swizzle = pci_std_swizzle,
2932
.map_irq = shark_map_irq,
3033
.nr_controllers = 1,
3134
.scan = via82c505_scan_bus,

‎arch/arm/mach-spear6xx/spear6xx.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
#include <linux/types.h>
1515
#include <linux/amba/pl061.h>
16-
#include <linux/types.h>
1716
#include <linux/ptrace.h>
1817
#include <linux/io.h>
1918
#include <asm/hardware/vic.h>

‎arch/arm/mm/cache-v7.S

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,11 @@ ENTRY(v7_flush_kern_cache_all)
9191
THUMB( stmfd sp!, {r4-r7, r9-r11, lr} )
9292
bl v7_flush_dcache_all
9393
mov r0, #0
94+
#ifdef CONFIG_SMP
95+
mcr p15, 0, r0, c7, c1, 0 @ invalidate I-cache inner shareable
96+
#else
9497
mcr p15, 0, r0, c7, c5, 0 @ I+BTB cache invalidate
98+
#endif
9599
ARM( ldmfd sp!, {r4-r5, r7, r9-r11, lr} )
96100
THUMB( ldmfd sp!, {r4-r7, r9-r11, lr} )
97101
mov pc, lr

‎arch/arm/nwfpe/ChangeLog

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
1998-11-23 Scott Bambrough <[email protected]>
7373

7474
* README.FPE - fix typo in description of lfm/sfm instructions
75-
* NOTES - Added file to describe known bugs/problems
75+
* NOTES - Added file to describe known bugs/problems
7676
* fpmodule.c - Changed version number to 0.94
7777

7878
1998-11-20 Scott Bambrough <[email protected]>

‎arch/arm/nwfpe/fpsr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ one byte.
3030
EXCEPTION TRAP ENABLE BYTE
3131
SYSTEM CONTROL BYTE
3232
CUMULATIVE EXCEPTION FLAGS BYTE
33-
33+
3434
The FPCR is a 32 bit register consisting of bit flags.
3535
*/
3636

0 commit comments

Comments
 (0)