diff options
| author | Mark Brown <broonie@linaro.org> | 2014-02-10 17:37:55 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-02-10 17:37:55 +0000 |
| commit | 4ed15484d2b90c28ecb0eb4ed0330049343c60ad (patch) | |
| tree | a95b5adbc989002647a42b0f392f311015a0fa02 /arch/arm | |
| parent | 0f3550b731084e2790caf1d73bfe0e3a454aafae (diff) | |
| parent | 4b9c8ddadce3ec70fa5d93875adeda861b21c84e (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-at91/sam9_smc.c | 2 | ||||
| -rw-r--r-- | arch/arm/net/bpf_jit_32.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-at91/sam9_smc.c b/arch/arm/mach-at91/sam9_smc.c index 99a0a1d2b7d..b26156bf15d 100644 --- a/arch/arm/mach-at91/sam9_smc.c +++ b/arch/arm/mach-at91/sam9_smc.c @@ -101,7 +101,7 @@ static void sam9_smc_cs_read(void __iomem *base, /* Pulse register */ val = __raw_readl(base + AT91_SMC_PULSE); - config->nwe_setup = val & AT91_SMC_NWEPULSE; + config->nwe_pulse = val & AT91_SMC_NWEPULSE; config->ncs_write_pulse = (val & AT91_SMC_NCS_WRPULSE) >> 8; config->nrd_pulse = (val & AT91_SMC_NRDPULSE) >> 16; config->ncs_read_pulse = (val & AT91_SMC_NCS_RDPULSE) >> 24; diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c index 1a643ee8e08..6de423dbd38 100644 --- a/arch/arm/net/bpf_jit_32.c +++ b/arch/arm/net/bpf_jit_32.c @@ -637,10 +637,10 @@ load_ind: emit(ARM_MUL(r_A, r_A, r_X), ctx); break; case BPF_S_ALU_DIV_K: - /* current k == reciprocal_value(userspace k) */ + if (k == 1) + break; emit_mov_i(r_scratch, k, ctx); - /* A = top 32 bits of the product */ - emit(ARM_UMULL(r_scratch, r_A, r_A, r_scratch), ctx); + emit_udiv(r_A, r_A, r_scratch, ctx); break; case BPF_S_ALU_DIV_X: update_on_xread(ctx); |