diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-02 18:50:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-02 18:50:57 -0800 |
| commit | b06b5a53adcc3ace1a82b324edf2b0c37e7be00e (patch) | |
| tree | 627599b14a3652778f4ca1f8a42d6627a6c6c84f /include/asm-arm/flat.h | |
| parent | c6b33cc4e9882b44f1b0c36396f420076e04a4e2 (diff) | |
| parent | d02b161eda65528ad3e89d642e416c265c17ceb8 (diff) | |
| download | blackbird-op-linux-b06b5a53adcc3ace1a82b324edf2b0c37e7be00e.tar.gz blackbird-op-linux-b06b5a53adcc3ace1a82b324edf2b0c37e7be00e.zip | |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 4081/1: Add definition for TI Sync Serial Protocol
[ARM] 4080/1: Fix for the SSCR0_SlotsPerFrm macro
[ARM] Fix VFP initialisation issue for SMP systems
[ARM] 4078/1: Fix ARM copypage cache coherency problems
[ARM] 4077/1: iop13xx: fix __io() macro
[ARM] 4074/1: Flat loader stack alignment
[ARM] 4073/1: Prevent s3c24xx drivers from including asm/arch/hardware.h and asm/arch/irqs.h
[ARM] 4071/1: S3C24XX: Documentation update
[ARM] 4066/1: correct a comment about PXA's sched_clock range
[ARM] 4065/1: S3C24XX: dma printk fixes
[ARM] 4064/1: make pxa_get_cycles() static
[ARM] 4063/1: ep93xx: fix IRQ_EP93XX_GPIO?MUX numbering
Diffstat (limited to 'include/asm-arm/flat.h')
| -rw-r--r-- | include/asm-arm/flat.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-arm/flat.h b/include/asm-arm/flat.h index 966946478589..16f5375e57b8 100644 --- a/include/asm-arm/flat.h +++ b/include/asm-arm/flat.h @@ -5,7 +5,9 @@ #ifndef __ARM_FLAT_H__ #define __ARM_FLAT_H__ -#define flat_stack_align(sp) /* nothing needed */ +/* An odd number of words will be pushed after this alignment, so + deliberately misalign the value. */ +#define flat_stack_align(sp) sp = (void *)(((unsigned long)(sp) - 4) | 4) #define flat_argvp_envp_on_stack() 1 #define flat_old_ram_flag(flags) (flags) #define flat_reloc_valid(reloc, size) ((reloc) <= (size)) |
