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

Commit 6bb88247 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



net/ipv6/ip6_gre.c is a case of parallel adds.

include/trace/events/tcp.h is a little bit more tricky.  The removal
of in-trace-macro ifdefs in 'net' paralleled with moving
show_tcp_state_name and friends over to include/trace/events/sock.h
in 'net-next'.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d367341b 2758b3e3

Documentation/devicetree/bindings/sound/da7218.txt

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ Example: 
		compatible = "dlg,da7218";

		reg = <0x1a>;

		interrupt-parent = <&gpio6>;

		interrupts = <11 IRQ_TYPE_LEVEL_HIGH>;

		interrupts = <11 IRQ_TYPE_LEVEL_LOW>;

		wakeup-source;



		VDD-supply = <&reg_audio>;

Documentation/devicetree/bindings/sound/da7219.txt

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ Example: 
		reg = <0x1a>;



		interrupt-parent = <&gpio6>;

		interrupts = <11 IRQ_TYPE_LEVEL_HIGH>;

		interrupts = <11 IRQ_TYPE_LEVEL_LOW>;



		VDD-supply = <&reg_audio>;

		VDDMIC-supply = <&reg_audio>;

Documentation/x86/x86_64/mm.txt

+11 −13
Original line number Diff line number Diff line 


<previous description obsolete, deleted>



Virtual memory map with 4 level page tables:



0000000000000000 - 00007fffffffffff (=47 bits) user space, different per mm
@@ -14,13 +12,15 @@ ffffea0000000000 - ffffeaffffffffff (=40 bits) virtual memory map (1TB) 
... unused hole ...

ffffec0000000000 - fffffbffffffffff (=44 bits) kasan shadow memory (16TB)

... unused hole ...

fffffe8000000000 - fffffeffffffffff (=39 bits) cpu_entry_area mapping

ffffff0000000000 - ffffff7fffffffff (=39 bits) %esp fixup stacks

... unused hole ...

ffffffef00000000 - fffffffeffffffff (=64 GB) EFI region mapping space

... unused hole ...

ffffffff80000000 - ffffffff9fffffff (=512 MB)  kernel text mapping, from phys 0

ffffffffa0000000 - ffffffffff5fffff (=1526 MB) module mapping space (variable)

ffffffffff600000 - ffffffffffdfffff (=8 MB) vsyscalls

ffffffffa0000000 - [fixmap start]   (~1526 MB) module mapping space (variable)

[fixmap start]   - ffffffffff5fffff kernel-internal fixmap range

ffffffffff600000 - ffffffffff600fff (=4 kB) legacy vsyscall ABI

ffffffffffe00000 - ffffffffffffffff (=2 MB) unused hole



Virtual memory map with 5 level page tables:
@@ -36,19 +36,22 @@ ffd4000000000000 - ffd5ffffffffffff (=49 bits) virtual memory map (512TB) 
... unused hole ...

ffdf000000000000 - fffffc0000000000 (=53 bits) kasan shadow memory (8PB)

... unused hole ...

fffffe8000000000 - fffffeffffffffff (=39 bits) cpu_entry_area mapping

ffffff0000000000 - ffffff7fffffffff (=39 bits) %esp fixup stacks

... unused hole ...

ffffffef00000000 - fffffffeffffffff (=64 GB) EFI region mapping space

... unused hole ...

ffffffff80000000 - ffffffff9fffffff (=512 MB)  kernel text mapping, from phys 0

ffffffffa0000000 - ffffffffff5fffff (=1526 MB) module mapping space

ffffffffff600000 - ffffffffffdfffff (=8 MB) vsyscalls

ffffffffa0000000 - [fixmap start]   (~1526 MB) module mapping space

[fixmap start]   - ffffffffff5fffff kernel-internal fixmap range

ffffffffff600000 - ffffffffff600fff (=4 kB) legacy vsyscall ABI

ffffffffffe00000 - ffffffffffffffff (=2 MB) unused hole



Architecture defines a 64-bit virtual address. Implementations can support

less. Currently supported are 48- and 57-bit virtual addresses. Bits 63

through to the most-significant implemented bit are set to either all ones

or all zero. This causes hole between user space and kernel addresses.

through to the most-significant implemented bit are sign extended.

This causes hole between user space and kernel addresses if you interpret them

as unsigned.



The direct mapping covers all memory in the system up to the highest

memory address (this means in some cases it can also include PCI memory
@@ -58,9 +61,6 @@ vmalloc space is lazily synchronized into the different PML4/PML5 pages of 
the processes using the page fault handler, with init_top_pgt as

reference.



Current X86-64 implementations support up to 46 bits of address space (64 TB),

which is our current limit. This expands into MBZ space in the page tables.



We map EFI runtime services in the 'efi_pgd' PGD in a 64Gb large virtual

memory window (this size is arbitrary, it can be raised later if needed).

The mappings are not part of any other kernel PGD and are only available
@@ -72,5 +72,3 @@ following fixmap section. 
Note that if CONFIG_RANDOMIZE_MEMORY is enabled, the direct mapping of all

physical memory, vmalloc/ioremap space and virtual memory map are randomized.

Their order is preserved but their base will be offset early at boot time.
 


-Andi Kleen, Jul 2004

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
VERSION = 4

PATCHLEVEL = 15

SUBLEVEL = 0

EXTRAVERSION = -rc4

EXTRAVERSION = -rc5

NAME = Fearless Coyote



# *DOCUMENTATION*

arch/powerpc/include/asm/mmu_context.h

+3 −2
Original line number Diff line number Diff line
@@ -160,9 +160,10 @@ static inline void enter_lazy_tlb(struct mm_struct *mm, 
#endif

}



static inline void arch_dup_mmap(struct mm_struct *oldmm,

static inline int arch_dup_mmap(struct mm_struct *oldmm,

				struct mm_struct *mm)

{

	return 0;

}



#ifndef CONFIG_PPC_BOOK3S_64