diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-02 23:36:21 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-02 23:50:36 +0000 |
| commit | b9e68670cc3a13166b389ce847af19b0d0d33c67 (patch) | |
| tree | bb79d91266490fa5bfe77cfef53ead8a1f7a62f6 /arch/arm/boot/compressed/head.S | |
| parent | 60de2ba51eaba9eefcc355cb20c8582b1481e755 (diff) | |
| parent | 5bddd17fec58f253cddd0bc9eab2cd9eb1bbab4a (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/intel_drv.h
Diffstat (limited to 'arch/arm/boot/compressed/head.S')
| -rw-r--r-- | arch/arm/boot/compressed/head.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 6825c34646d..9be21ba648c 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S @@ -1084,6 +1084,6 @@ memdump: mov r12, r0 reloc_end: .align - .section ".stack", "w" + .section ".stack", "aw", %nobits user_stack: .space 4096 user_stack_end: |