Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f3d1f98 authored by Russell King's avatar Russell King
Browse files

Merge branches 'fixes', 'misc' and 'sa1111-for-next' into for-next

parents b9dd05c7 2a14b80c de854b33

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ config ARM 
	bool

	default y

	select ARCH_CLOCKSOURCE_DATA

	select ARCH_DISCARD_MEMBLOCK if !HAVE_ARCH_PFN_VALID

	select ARCH_HAS_DEBUG_VIRTUAL

	select ARCH_HAS_DEVMEM_IS_ALLOWED

	select ARCH_HAS_ELF_RANDOMIZE

arch/arm/boot/compressed/Makefile

+5 −2
Original line number Diff line number Diff line
@@ -116,8 +116,11 @@ ccflags-y := -fpic -mno-single-pic-base -fno-builtin -I$(obj) 
asflags-y := -DZIMAGE



# Supply kernel BSS size to the decompressor via a linker symbol.

KBSS_SZ = $(shell $(CROSS_COMPILE)size $(obj)/../../../../vmlinux | \

		awk 'END{print $$3}')

KBSS_SZ = $(shell $(CROSS_COMPILE)nm $(obj)/../../../../vmlinux | \

		perl -e 'while (<>) { \

			$$bss_start=hex($$1) if /^([[:xdigit:]]+) B __bss_start$$/; \

			$$bss_end=hex($$1) if /^([[:xdigit:]]+) B __bss_stop$$/; \

		}; printf "%d\n", $$bss_end - $$bss_start;')

LDFLAGS_vmlinux = --defsym _kernel_bss_size=$(KBSS_SZ)

# Supply ZRELADDR to the decompressor via a linker symbol.

ifneq ($(CONFIG_AUTO_ZRELADDR),y)

arch/arm/boot/compressed/head.S

+2 −0
Original line number Diff line number Diff line
@@ -143,6 +143,8 @@ start: 
		.word	_magic_start	@ absolute load/run zImage address

		.word	_magic_end	@ zImage end address

		.word	0x04030201	@ endianness flag

		.word	0x45454545	@ another magic number to indicate

		.word	_magic_table	@ additional data table



		__EFI_HEADER

1:

arch/arm/boot/compressed/vmlinux.lds.S

+11 −0
Original line number Diff line number Diff line
@@ -44,12 +44,22 @@ SECTIONS 
    *(.glue_7t)

    *(.glue_7)

  }

  .table : ALIGN(4) {

    _table_start = .;

    LONG(ZIMAGE_MAGIC(2))

    LONG(ZIMAGE_MAGIC(0x5a534c4b))

    LONG(ZIMAGE_MAGIC(__piggy_size_addr - _start))

    LONG(ZIMAGE_MAGIC(_kernel_bss_size))

    LONG(0)

    _table_end = .;

  }

  .rodata : {

    *(.rodata)

    *(.rodata.*)

  }

  .piggydata : {

    *(.piggydata)

    __piggy_size_addr = . - 4;

  }



  . = ALIGN(4);
@@ -97,6 +107,7 @@ SECTIONS 
  _magic_sig = ZIMAGE_MAGIC(0x016f2818);

  _magic_start = ZIMAGE_MAGIC(_start);

  _magic_end = ZIMAGE_MAGIC(_edata);

  _magic_table = ZIMAGE_MAGIC(_table_start - _start);



  . = BSS_START;

  __bss_start = .;

arch/arm/include/asm/dma-mapping.h

+0 −7
Original line number Diff line number Diff line
@@ -189,13 +189,6 @@ extern int arm_dma_mmap(struct device *dev, struct vm_area_struct *vma, 
			void *cpu_addr, dma_addr_t dma_addr, size_t size,

			unsigned long attrs);



/*

 * This can be called during early boot to increase the size of the atomic

 * coherent DMA pool above the default value of 256KiB. It must be called

 * before postcore_initcall.

 */

extern void __init init_dma_coherent_pool_size(unsigned long size);



/*

 * For SA-1111, IXP425, and ADI systems  the dma-mapping functions are "magic"

 * and utilize bounce buffers as needed to work around limited DMA windows.