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

Commit 108df9c2 authored by Alex Shi's avatar Alex Shi
Browse files

Merge tag 'v3.18.47' into linux-linaro-lsk-v3.18 

 This is the 3.18.47 stable release
parents 8e20db3c 8433e5c9

Documentation/virtual/kvm/api.txt

+1 −0
Original line number Diff line number Diff line
@@ -1919,6 +1919,7 @@ registers, find a list below: 
  PPC   | KVM_REG_PPC_TM_VSCR           | 32

  PPC   | KVM_REG_PPC_TM_DSCR           | 64

  PPC   | KVM_REG_PPC_TM_TAR            | 64

  PPC   | KVM_REG_PPC_TM_XER            | 64

        |                               |

  MIPS  | KVM_REG_MIPS_R0               | 64

          ...

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 18

SUBLEVEL = 46

SUBLEVEL = 47

EXTRAVERSION =

NAME = Diseased Newt

arch/arm/xen/enlighten.c

+1 −2
Original line number Diff line number Diff line
@@ -295,8 +295,7 @@ static int __init xen_guest_init(void) 
	 * for secondary CPUs as they are brought up.

	 * For uniformity we use VCPUOP_register_vcpu_info even on cpu0.

	 */

	xen_vcpu_info = __alloc_percpu(sizeof(struct vcpu_info),

			                       sizeof(struct vcpu_info));

	xen_vcpu_info = alloc_percpu(struct vcpu_info);

	if (xen_vcpu_info == NULL)

		return -ENOMEM;

arch/powerpc/boot/ps3-head.S

+0 −5
Original line number Diff line number Diff line
@@ -57,11 +57,6 @@ __system_reset_overlay: 
	bctr



1:

	/* Save the value at addr zero for a null pointer write check later. */



	li	r4, 0

	lwz	r3, 0(r4)



	/* Primary delays then goes to _zimage_start in wrapper. */



	or	31, 31, 31 /* db16cyc */

arch/powerpc/boot/ps3.c

+1 −7
Original line number Diff line number Diff line
@@ -119,13 +119,12 @@ void ps3_copy_vectors(void) 
	flush_cache((void *)0x100, 512);

}



void platform_init(unsigned long null_check)

void platform_init(void)

{

	const u32 heapsize = 0x1000000 - (u32)_end; /* 16MiB */

	void *chosen;

	unsigned long ft_addr;

	u64 rm_size;

	unsigned long val;



	console_ops.write = ps3_console_write;

	platform_ops.exit = ps3_exit;
@@ -153,11 +152,6 @@ void platform_init(unsigned long null_check) 


	printf(" flat tree at 0x%lx\n\r", ft_addr);



	val = *(unsigned long *)0;



	if (val != null_check)

		printf("null check failed: %lx != %lx\n\r", val, null_check);



	((kernel_entry_t)0)(ft_addr, 0, NULL);



	ps3_exit();