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

Commit 8760f8e3 authored by Dmitry Shmidt's avatar Dmitry Shmidt
Browse files

Merge remote-tracking branch 'common/android-4.4' into android-4.4.y

Change-Id: I6c4e7f9f47392d4b334f71e2b20f2ccf33827632
parents 734bcf32 4055d6b5
Loading
Loading
Loading
Loading
+13 −7
Original line number Diff line number Diff line
@@ -109,7 +109,13 @@ Header notes:
			1 - 4K
			2 - 16K
			3 - 64K
  Bits 3-63:	Reserved.
  Bit 3:	Kernel physical placement
			0 - 2MB aligned base should be as close as possible
			    to the base of DRAM, since memory below it is not
			    accessible via the linear mapping
			1 - 2MB aligned base may be anywhere in physical
			    memory
  Bits 4-63:	Reserved.

- When image_size is zero, a bootloader should attempt to keep as much
  memory as possible free for use by the kernel immediately after the
@@ -117,14 +123,14 @@ Header notes:
  depending on selected features, and is effectively unbound.

The Image must be placed text_offset bytes from a 2MB aligned base
address near the start of usable system RAM and called there. Memory
below that base address is currently unusable by Linux, and therefore it
is strongly recommended that this location is the start of system RAM.
The region between the 2 MB aligned base address and the start of the
image has no special significance to the kernel, and may be used for
other purposes.
address anywhere in usable system RAM and called there. The region
between the 2 MB aligned base address and the start of the image has no
special significance to the kernel, and may be used for other purposes.
At least image_size bytes from the start of the image must be free for
use by the kernel.
NOTE: versions prior to v4.6 cannot make use of memory below the
physical offset of the Image so it is recommended that the Image be
placed as close as possible to the start of system RAM.

Any memory described to the kernel (even that below the start of the
image) which is not marked as reserved from the kernel (e.g., with a
+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@
    |       alpha: | TODO |
    |         arc: | TODO |
    |         arm: | TODO |
    |       arm64: | TODO |
    |       arm64: |  ok  |
    |       avr32: | TODO |
    |    blackfin: | TODO |
    |         c6x: | TODO |
+4 −0
Original line number Diff line number Diff line
@@ -3415,6 +3415,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.

	ro		[KNL] Mount root device read-only on boot

	rodata=		[KNL]
		on	Mark read-only kernel memory as read-only (default).
		off	Leave read-only kernel memory writable for debugging.

	root=		[KNL] Root filesystem
			See name_to_dev_t comment in init/do_mounts.c.

+1 −0
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ CONFIG_PPP_MPPE=y
CONFIG_PREEMPT=y
CONFIG_PROFILING=y
CONFIG_QUOTA=y
CONFIG_RANDOMIZE_BASE=y
CONFIG_RTC_CLASS=y
CONFIG_RT_GROUP_SCHED=y
CONFIG_SECCOMP=y
+0 −1
Original line number Diff line number Diff line
@@ -491,7 +491,6 @@ static inline int set_memory_nx(unsigned long addr, int numpages) { return 0; }
#endif

#ifdef CONFIG_DEBUG_RODATA
void mark_rodata_ro(void);
void set_kernel_text_rw(void);
void set_kernel_text_ro(void);
#else
Loading