Commits · 6645cb61f3a1186a71475385d33f875dd8fb38bf · Kirill Smelkov / linux

21 Jul, 2011 1 commit

ARM: Fix build errors caused by adding generic macros · 6645cb61

Russell King authored Jul 21, 2011

Commit 66a625a8 (ARM: mm: proc-macros: Add generic proc/cache/tlb struct
definition macros) introduced build errors when PM_SLEEP is not enabled.
The per-CPU do_suspend/do_resume functions are defined via the
preprocessor to constant 0. However, the macros which use these were
converted to assembly, resulting in undefined references to these
functions. Fix that by moving the ! ifdef section into proc-macros.S
and deleting it from all effected proc-*.S files.
Acked-by: Dave Martin <dave.martin@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

6645cb61

18 Jul, 2011 11 commits
- Merge branch 'dma' of http://git.linaro.org/git/people/nico/linux into devel-stable · 07f1c295
  Russell King authored Jul 18, 2011
  
  07f1c295
- ARM: ARM_DMA_ZONE_SIZE is no more · fb89fcfb
  Nicolas Pitre authored Jul 18, 2011
```
One less dependency on mach/memory.h.
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
```
  fb89fcfb
- ARM: mach-shark: move ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size · fded1ef9
  Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
```
  fded1ef9
- ARM: mach-sa1100: move ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size · e9107ab6
  Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
```
  e9107ab6
- ARM: mach-realview: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size · 00e9125e
  Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
```
  00e9125e
- ARM: mach-pxa: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size · 805e88dc
  Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
```
  805e88dc
- ARM: mach-ixp4xx: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size · 7553ee77
  Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
```
  7553ee77
- ARM: mach-h720x: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size · 5065c71d
  Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
```
  5065c71d
- ARM: mach-davinci: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size · f68deabf
  Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
```
  f68deabf
- ARM: add dma_zone_size to the machine_desc structure · 4fddcaeb
  Nicolas Pitre authored Jul 05, 2011
```
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
```
  4fddcaeb
- ARM: change ARM_DMA_ZONE_SIZE into a variable · 65032018
  Nicolas Pitre authored Jul 18, 2011
```
Having this value defined at compile time prevents multiple machines with
conflicting definitions to coexist.  Move it to a variable in preparation
for having a per machine value selected at run time.  This is relevant
only when CONFIG_ZONE_DMA is selected.
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
```
  65032018
15 Jul, 2011 1 commit
- Merge branch 'kprobes-thumb' of git://git.yxit.co.uk/linux into devel-stable · 4aa96ccf
  Russell King authored Jul 15, 2011
  
  4aa96ccf
13 Jul, 2011 27 commits

ARM: kprobes: Remove now unused code · 8f2ffa00

Jon Medhurst authored Jun 13, 2011

Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>

8f2ffa00

ARM: kprobes: Decode ARM preload (immediate) instructions · 0239269d

Jon Medhurst authored Jul 07, 2011

These were missing from the previous implementation.
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>

0239269d

ARM: kprobes: Reject probing of unprivileged load and store instructions · 465f1ea5

Jon Medhurst authored Jun 11, 2011

These occur extremely rarely in the kernel and writing test cases for
them is difficult.
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>

465f1ea5

ARM: kprobes: Use new versions of emulate_ldr() and emulate_str() · 711bf106
Jon Medhurst authored Jun 11, 2011
```
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
```
711bf106

ARM: kprobes: Add new versions of emulate_ldr() and emulate_str() · 3c48fbb1

Jon Medhurst authored Jun 11, 2011

These use the register calling conventions required by the new decoding
table framework for calling simulated instructions.

We rename the old versions of these functions to *_old for now.
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>

3c48fbb1

ARM: kprobes: Add emulate_rdlo12rdhi16rn0rm8_rwflags_nopc() · 12ce5d33

Jon Medhurst authored Jun 10, 2011

This is the emulation function for the instruction format used by the
ARM multiply long instructions. It replaces use of
prep_emulate_rdhi16rdlo12rs8rm0_wflags().
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>

12ce5d33

ARM: kprobes: Add emulate_rd12rm0_noflags_nopc() · c82584eb

Jon Medhurst authored Jun 10, 2011

This is the emulation function for the instruction format used by the
ARM bit-field manipulation instructions.

Various other instruction forms can also make use of this and it is used
to replace use of prep_emulate_rd12{rm0}{_modify}
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>

c82584eb

ARM: kprobes: Replace use of prep_emulate_rd12rn16rm0_wflags() · 35fab774

Jon Medhurst authored Jun 10, 2011

These can now use emulate_rd12rn16rm0_rwflags_nopc().
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>

35fab774

ARM: kprobes: Add emulate_rd16rn12rm0rs8_rwflags_nopc() · 6091dfae

Jon Medhurst authored Jun 10, 2011

This is the emulation function for the instruction format used by the
ARM multiply-accumulate instructions. These don't allow use of PC so we
don't have to add special cases for this.

This function is used to replace use of prep_emulate_rd16rs8rm0_wflags
and prep_emulate_rd16rn12rs8rm0_wflags.
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>

6091dfae

ARM: kprobes: Migrate remaining instruction decoding functions to tables · e9a92859
Jon Medhurst authored Jun 10, 2011
```
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
```
e9a92859
ARM: kprobes: Migrate ARM space_cccc_100x to decoding tables · 0d32e7d1
Jon Medhurst authored Jun 09, 2011
```
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
```
0d32e7d1
ARM: kprobes: Migrate ARM space_cccc_01xx to decoding tables · 56d8fbdd
Jon Medhurst authored Jun 09, 2011
```
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
```
56d8fbdd
ARM: kprobes: Migrate ARM space_cccc_0111__1 to decoding tables · ad2e81a7
Jon Medhurst authored Jun 08, 2011
```
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
```
ad2e81a7
ARM: kprobes: Migrate ARM space_cccc_0110__1 to decoding tables · 2ce5d033
Jon Medhurst authored Jun 08, 2011
```
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
```
2ce5d033

ARM: kprobes: Add emulate_rd12rn16rm0_rwflags_nopc() · 0e44e9a0

Jon Medhurst authored Jun 09, 2011

This is the emulation function for the instruction format used by the
ARM media instructions.
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>

0e44e9a0

ARM: kprobes: Migrate ARM space_cccc_001x to decoding tables · c038f3af
Jon Medhurst authored Jun 08, 2011
```
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
```
c038f3af
ARM: kprobes: Migrate ARM space_cccc_000x to decoding tables · 75f115c0
Jon Medhurst authored Jun 07, 2011
```
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
```
75f115c0
ARM: kprobes: Migrate ARM LDRD and STRD to decoding tables · 6c8a1929
Jon Medhurst authored Jun 06, 2011
```
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
```
6c8a1929

ARM: kprobes: Add emulate_ldrdstrd() · 8723942f

Jon Medhurst authored Jun 09, 2011

This is an emulation function for the LDRD and STRD instructions.
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>

8723942f

ARM: kprobes: Migrate ARM data-processing (register) instructions to decoding tables · 3535a89a
Jon Medhurst authored Jun 06, 2011
```
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
```
3535a89a

ARM: kprobes: Add emulate_rd12rn16rm0rs8_rwflags() · 9f596e51

Jon Medhurst authored Jun 09, 2011

This is the emulation function for the instruction format used by the
ARM data-processing instructions.
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>

9f596e51

ARM: kprobes: Add BLX macro · 7be7ee2d

Jon Medhurst authored Jul 07, 2011

This is for use by inline assembler which will be added to kprobes-arm.c
It saves memory when used on newer ARM architectures and also provides
correct interworking should ARM probes be required on Thumb kernels in
the future.
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>

7be7ee2d

ARM: kprobes: Add alu_write_pc() · df4fa1f8

Jon Medhurst authored Jul 01, 2011

This writes a new value to PC which was obtained as the result of an ARM
ALU instruction. For ARMv7 and later this performs interworking.

On ARM kernels we shouldn't encounter any ALU instructions trying to
switch to Thumb mode so support for this isn't strictly necessary.
However, the approach taken in all other instruction decoding is for us
to avoid unpredictable modification of the PC for security reasons. This
is usually achieved by rejecting insertion of probes on problematic
instruction, but for ALU instructions we can't do this as it depends on
the contents of the CPU registers at the time the probe is hit. So, as
we require some form of run-time checking to trap undesirable PC
modification, we may as well simulate the instructions correctly, i.e.
in the way they would behave in the absence of a probe.
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>

df4fa1f8

ARM: kprobes: Migrate ARM space_1111 to decoding tables · 9a5c1284
Jon Medhurst authored Jun 06, 2011
```
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
```
9a5c1284
ARM: kprobes: Decode 32-bit Thumb multiply and absolute difference instructions · bb1085f8
Jon Medhurst authored Jul 03, 2011
```
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
```
bb1085f8
ARM: kprobes: Decode 32-bit Thumb long multiply and divide instructions · 231fb150
Jon Medhurst authored Jul 03, 2011
```
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
```
231fb150
ARM: kprobes: Decode 32-bit Thumb data-processing (register) instructions · 31656c1a
Jon Medhurst authored Jul 03, 2011
```
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
```
31656c1a