diff options
| author | Daniel Hillenbrand <daniel.hillenbrand@codeworkx.de> | 2012-07-22 08:24:33 +0200 |
|---|---|---|
| committer | Daniel Hillenbrand <daniel.hillenbrand@codeworkx.de> | 2012-07-22 08:24:33 +0200 |
| commit | 1fac3f06074b6c49e3beb5f525480134f4397d53 (patch) | |
| tree | 526f624bd6d1af1709cf4bdb88f7b635137fab6a /arch/arm | |
| parent | 5cd9c9ee8c8c43d9a97d2ee1c9f5b0da20668e36 (diff) | |
| download | kernel_samsung_smdk4412-1fac3f06074b6c49e3beb5f525480134f4397d53.zip kernel_samsung_smdk4412-1fac3f06074b6c49e3beb5f525480134f4397d53.tar.gz kernel_samsung_smdk4412-1fac3f06074b6c49e3beb5f525480134f4397d53.tar.bz2 | |
gcc 4.6 compat
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/cyanogenmod_i9300_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/board-m0-modems.c | 4 | ||||
| -rw-r--r-- | arch/arm/mm/alignment.c | 4 | ||||
| -rw-r--r-- | arch/arm/mvp/mvpkm/mvpkm_main.c | 1 |
4 files changed, 7 insertions, 4 deletions
diff --git a/arch/arm/configs/cyanogenmod_i9300_defconfig b/arch/arm/configs/cyanogenmod_i9300_defconfig index 633452f..9909b9f 100644 --- a/arch/arm/configs/cyanogenmod_i9300_defconfig +++ b/arch/arm/configs/cyanogenmod_i9300_defconfig @@ -106,7 +106,7 @@ CONFIG_RD_GZIP=y # CONFIG_RD_XZ is not set # CONFIG_RD_LZO is not set # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_CC_CHECK_WARNING_STRICTLY=y +# CONFIG_CC_CHECK_WARNING_STRICTLY is not set CONFIG_SYSCTL=y CONFIG_ANON_INODES=y CONFIG_PANIC_TIMEOUT=1 diff --git a/arch/arm/mach-exynos/board-m0-modems.c b/arch/arm/mach-exynos/board-m0-modems.c index 9362e24..76e9ab9 100644 --- a/arch/arm/mach-exynos/board-m0-modems.c +++ b/arch/arm/mach-exynos/board-m0-modems.c @@ -289,7 +289,7 @@ static void umts_modem_cfg_gpio(void) unsigned gpio_cp_dump_int = umts_modem_data.gpio_cp_dump_int; unsigned gpio_ap_dump_int = umts_modem_data.gpio_ap_dump_int; unsigned gpio_flm_uart_sel = umts_modem_data.gpio_flm_uart_sel; - unsigned irq_phone_active = umts_modem_res[0].start; + /* unsigned irq_phone_active = umts_modem_res[0].start; */ if (gpio_reset_req_n) { err = gpio_request(gpio_reset_req_n, "RESET_REQ_N"); @@ -336,7 +336,7 @@ static void umts_modem_cfg_gpio(void) "PHONE_ACTIVE", err); } gpio_direction_input(gpio_phone_active); - pr_err(LOG_TAG "check phone active = %d\n", irq_phone_active); + pr_err(LOG_TAG "check phone active = %d\n", gpio_phone_active); } if (gpio_cp_dump_int) { diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c index 724ba3b..c6035e9 100644 --- a/arch/arm/mm/alignment.c +++ b/arch/arm/mm/alignment.c @@ -824,8 +824,10 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs) case 0x08000000: /* ldm or stm, or thumb-2 32bit instruction */ if (thumb2_32b) handler = do_alignment_t32_to_handler(&instr, regs, &offset); - else + else { handler = do_alignment_ldmstm; + offset.un = 0; + } break; default: diff --git a/arch/arm/mvp/mvpkm/mvpkm_main.c b/arch/arm/mvp/mvpkm/mvpkm_main.c index 61df1a1..d32a4c1 100644 --- a/arch/arm/mvp/mvpkm/mvpkm_main.c +++ b/arch/arm/mvp/mvpkm/mvpkm_main.c @@ -2108,6 +2108,7 @@ SetupMonitor(MvpkmVM *vm) register uint32 r4 asm("r4") = hsctlr; asm volatile ( + ".arch_extension sec\n" "smc 0" : : "r" (r0), "r" (r1), "r" (r2), "r" (r3), "r" (r4) |