kernel: bump 5.15 to 5.15.125
1. Add new symbols to generic config 2. Bump kernel Changelog: https://lore.kernel.org/stable/2023080818-groin-gradient-a031@gregkh/ All patches automatically rebased. Signed-off-by: John Audia <therealgraysky@proton.me> [Refreshed on top of OpenWrt 23.05] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> (cherry picked from commit daed3322d347cae5fa538907b5f1fa5d5cfc08c6)
This commit is contained in:
		 John Audia
					John Audia
				
			
				
					committed by
					
						 Hauke Mehrtens
						Hauke Mehrtens
					
				
			
			
				
	
			
			
			 Hauke Mehrtens
						Hauke Mehrtens
					
				
			
						parent
						
							795a5dd452
						
					
				
				
					commit
					ec0ff928d9
				
			| @@ -1,2 +1,2 @@ | |||||||
| LINUX_VERSION-5.15 = .124 | LINUX_VERSION-5.15 = .125 | ||||||
| LINUX_KERNEL_HASH-5.15.124 = 00036a0260ad012aa832a8698a4afcf23b2410091527738ce48ce3fcc23f22ed | LINUX_KERNEL_HASH-5.15.125 = 150f3846b76cd23a6135f49cef71372bade5a06e851cb4f8558df8b862d8fec7 | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| --- a/arch/arm/Kconfig | --- a/arch/arm/Kconfig | ||||||
| +++ b/arch/arm/Kconfig | +++ b/arch/arm/Kconfig | ||||||
| @@ -571,6 +571,18 @@ config ARCH_VIRT | @@ -572,6 +572,18 @@ config ARCH_VIRT | ||||||
|  	select HAVE_ARM_ARCH_TIMER |  	select HAVE_ARM_ARCH_TIMER | ||||||
|  	select ARCH_SUPPORTS_BIG_ENDIAN |  	select ARCH_SUPPORTS_BIG_ENDIAN | ||||||
|   |   | ||||||
|   | |||||||
| @@ -13,7 +13,7 @@ Signed-off-by: Mathew McBride <matt@traverse.com.au> | |||||||
|  |  | ||||||
| --- a/arch/arm/Kconfig | --- a/arch/arm/Kconfig | ||||||
| +++ b/arch/arm/Kconfig | +++ b/arch/arm/Kconfig | ||||||
| @@ -117,7 +117,6 @@ config ARM | @@ -118,7 +118,6 @@ config ARM | ||||||
|  	select HAVE_UID16 |  	select HAVE_UID16 | ||||||
|  	select HAVE_VIRT_CPU_ACCOUNTING_GEN |  	select HAVE_VIRT_CPU_ACCOUNTING_GEN | ||||||
|  	select IRQ_FORCED_THREADING |  	select IRQ_FORCED_THREADING | ||||||
|   | |||||||
| @@ -202,7 +202,7 @@ | |||||||
| +subsys_initcall(ar5312_gpio_init); | +subsys_initcall(ar5312_gpio_init); | ||||||
| --- a/arch/mips/Kconfig | --- a/arch/mips/Kconfig | ||||||
| +++ b/arch/mips/Kconfig | +++ b/arch/mips/Kconfig | ||||||
| @@ -231,6 +231,7 @@ config ATH25 | @@ -232,6 +232,7 @@ config ATH25 | ||||||
|  	select CEVT_R4K |  	select CEVT_R4K | ||||||
|  	select CSRC_R4K |  	select CSRC_R4K | ||||||
|  	select DMA_NONCOHERENT |  	select DMA_NONCOHERENT | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ Signed-off-by: John Crispin <john@phrozen.org> | |||||||
|  |  | ||||||
| --- a/arch/mips/Kconfig | --- a/arch/mips/Kconfig | ||||||
| +++ b/arch/mips/Kconfig | +++ b/arch/mips/Kconfig | ||||||
| @@ -257,6 +257,8 @@ config ATH79 | @@ -258,6 +258,8 @@ config ATH79 | ||||||
|  	select SYS_SUPPORTS_BIG_ENDIAN |  	select SYS_SUPPORTS_BIG_ENDIAN | ||||||
|  	select SYS_SUPPORTS_MIPS16 |  	select SYS_SUPPORTS_MIPS16 | ||||||
|  	select SYS_SUPPORTS_ZBOOT_UART_PROM |  	select SYS_SUPPORTS_ZBOOT_UART_PROM | ||||||
|   | |||||||
| @@ -14,7 +14,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> | |||||||
|  |  | ||||||
| --- a/arch/mips/Kconfig | --- a/arch/mips/Kconfig | ||||||
| +++ b/arch/mips/Kconfig | +++ b/arch/mips/Kconfig | ||||||
| @@ -332,6 +332,9 @@ config BCM63XX | @@ -333,6 +333,9 @@ config BCM63XX | ||||||
|  	select SYNC_R4K |  	select SYNC_R4K | ||||||
|  	select DMA_NONCOHERENT |  	select DMA_NONCOHERENT | ||||||
|  	select IRQ_MIPS_CPU |  	select IRQ_MIPS_CPU | ||||||
|   | |||||||
| @@ -13,7 +13,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> | |||||||
|  |  | ||||||
| --- a/arch/mips/Kconfig | --- a/arch/mips/Kconfig | ||||||
| +++ b/arch/mips/Kconfig | +++ b/arch/mips/Kconfig | ||||||
| @@ -275,25 +275,20 @@ config BMIPS_GENERIC | @@ -276,25 +276,20 @@ config BMIPS_GENERIC | ||||||
|  	select SYNC_R4K |  	select SYNC_R4K | ||||||
|  	select COMMON_CLK |  	select COMMON_CLK | ||||||
|  	select BCM6345_L1_IRQ |  	select BCM6345_L1_IRQ | ||||||
|   | |||||||
| @@ -14,7 +14,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> | |||||||
|  |  | ||||||
| --- a/arch/mips/Kconfig | --- a/arch/mips/Kconfig | ||||||
| +++ b/arch/mips/Kconfig | +++ b/arch/mips/Kconfig | ||||||
| @@ -275,6 +275,7 @@ config BMIPS_GENERIC | @@ -276,6 +276,7 @@ config BMIPS_GENERIC | ||||||
|  	select SYNC_R4K |  	select SYNC_R4K | ||||||
|  	select COMMON_CLK |  	select COMMON_CLK | ||||||
|  	select BCM6345_L1_IRQ |  	select BCM6345_L1_IRQ | ||||||
|   | |||||||
| @@ -73,7 +73,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org> | |||||||
|  |  | ||||||
| --- a/arch/Kconfig | --- a/arch/Kconfig | ||||||
| +++ b/arch/Kconfig | +++ b/arch/Kconfig | ||||||
| @@ -1295,6 +1295,14 @@ config ARCH_HAS_ELFCORE_COMPAT | @@ -1298,6 +1298,14 @@ config ARCH_HAS_ELFCORE_COMPAT | ||||||
|  config ARCH_HAS_PARANOID_L1D_FLUSH |  config ARCH_HAS_PARANOID_L1D_FLUSH | ||||||
|  	bool |  	bool | ||||||
|   |   | ||||||
| @@ -90,7 +90,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org> | |||||||
|  source "scripts/gcc-plugins/Kconfig" |  source "scripts/gcc-plugins/Kconfig" | ||||||
| --- a/arch/x86/Kconfig | --- a/arch/x86/Kconfig | ||||||
| +++ b/arch/x86/Kconfig | +++ b/arch/x86/Kconfig | ||||||
| @@ -84,6 +84,7 @@ config X86 | @@ -85,6 +85,7 @@ config X86 | ||||||
|  	select ARCH_HAS_PMEM_API		if X86_64 |  	select ARCH_HAS_PMEM_API		if X86_64 | ||||||
|  	select ARCH_HAS_PTE_DEVMAP		if X86_64 |  	select ARCH_HAS_PTE_DEVMAP		if X86_64 | ||||||
|  	select ARCH_HAS_PTE_SPECIAL |  	select ARCH_HAS_PTE_SPECIAL | ||||||
|   | |||||||
| @@ -398,7 +398,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org> | |||||||
|  	mmdrop(mm); |  	mmdrop(mm); | ||||||
|  } |  } | ||||||
|   |   | ||||||
| @@ -2622,6 +2624,13 @@ pid_t kernel_clone(struct kernel_clone_a | @@ -2617,6 +2619,13 @@ pid_t kernel_clone(struct kernel_clone_a | ||||||
|  		get_task_struct(p); |  		get_task_struct(p); | ||||||
|  	} |  	} | ||||||
|   |   | ||||||
|   | |||||||
| @@ -24,7 +24,7 @@ Signed-off-by: Johan Almbladh <johan.almbladh@anyfinetworks.com> | |||||||
|  L:	bpf@vger.kernel.org |  L:	bpf@vger.kernel.org | ||||||
| --- a/arch/mips/Kconfig | --- a/arch/mips/Kconfig | ||||||
| +++ b/arch/mips/Kconfig | +++ b/arch/mips/Kconfig | ||||||
| @@ -57,7 +57,6 @@ config MIPS | @@ -58,7 +58,6 @@ config MIPS | ||||||
|  	select HAVE_ARCH_TRACEHOOK |  	select HAVE_ARCH_TRACEHOOK | ||||||
|  	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES |  	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES | ||||||
|  	select HAVE_ASM_MODVERSIONS |  	select HAVE_ASM_MODVERSIONS | ||||||
| @@ -32,7 +32,7 @@ Signed-off-by: Johan Almbladh <johan.almbladh@anyfinetworks.com> | |||||||
|  	select HAVE_CONTEXT_TRACKING |  	select HAVE_CONTEXT_TRACKING | ||||||
|  	select HAVE_TIF_NOHZ |  	select HAVE_TIF_NOHZ | ||||||
|  	select HAVE_C_RECORDMCOUNT |  	select HAVE_C_RECORDMCOUNT | ||||||
| @@ -65,7 +64,10 @@ config MIPS | @@ -66,7 +65,10 @@ config MIPS | ||||||
|  	select HAVE_DEBUG_STACKOVERFLOW |  	select HAVE_DEBUG_STACKOVERFLOW | ||||||
|  	select HAVE_DMA_CONTIGUOUS |  	select HAVE_DMA_CONTIGUOUS | ||||||
|  	select HAVE_DYNAMIC_FTRACE |  	select HAVE_DYNAMIC_FTRACE | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> | |||||||
| --- | --- | ||||||
| --- a/arch/arm/Kconfig | --- a/arch/arm/Kconfig | ||||||
| +++ b/arch/arm/Kconfig | +++ b/arch/arm/Kconfig | ||||||
| @@ -117,6 +117,7 @@ config ARM | @@ -118,6 +118,7 @@ config ARM | ||||||
|  	select HAVE_UID16 |  	select HAVE_UID16 | ||||||
|  	select HAVE_VIRT_CPU_ACCOUNTING_GEN |  	select HAVE_VIRT_CPU_ACCOUNTING_GEN | ||||||
|  	select IRQ_FORCED_THREADING |  	select IRQ_FORCED_THREADING | ||||||
|   | |||||||
| @@ -9,7 +9,7 @@ Acked-by: Rob Landley <rob@landley.net> | |||||||
| --- | --- | ||||||
| --- a/arch/mips/Kconfig | --- a/arch/mips/Kconfig | ||||||
| +++ b/arch/mips/Kconfig | +++ b/arch/mips/Kconfig | ||||||
| @@ -1101,9 +1101,6 @@ config FW_ARC | @@ -1102,9 +1102,6 @@ config FW_ARC | ||||||
|  config ARCH_MAY_HAVE_PC_FDC |  config ARCH_MAY_HAVE_PC_FDC | ||||||
|  	bool |  	bool | ||||||
|   |   | ||||||
| @@ -19,7 +19,7 @@ Acked-by: Rob Landley <rob@landley.net> | |||||||
|  config CEVT_BCM1480 |  config CEVT_BCM1480 | ||||||
|  	bool |  	bool | ||||||
|   |   | ||||||
| @@ -3183,6 +3180,18 @@ choice | @@ -3184,6 +3181,18 @@ choice | ||||||
|  		bool "Extend builtin kernel arguments with bootloader arguments" |  		bool "Extend builtin kernel arguments with bootloader arguments" | ||||||
|  endchoice |  endchoice | ||||||
|   |   | ||||||
|   | |||||||
| @@ -31,7 +31,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org> | |||||||
|  	help |  	help | ||||||
| --- a/init/main.c | --- a/init/main.c | ||||||
| +++ b/init/main.c | +++ b/init/main.c | ||||||
| @@ -616,6 +616,29 @@ static inline void setup_nr_cpu_ids(void | @@ -614,6 +614,29 @@ static inline void setup_nr_cpu_ids(void | ||||||
|  static inline void smp_prepare_cpus(unsigned int maxcpus) { } |  static inline void smp_prepare_cpus(unsigned int maxcpus) { } | ||||||
|  #endif |  #endif | ||||||
|   |   | ||||||
| @@ -61,7 +61,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org> | |||||||
|  /* |  /* | ||||||
|   * We need to store the untouched command line for future reference. |   * We need to store the untouched command line for future reference. | ||||||
|   * We also need to store the touched command line since the parameter |   * We also need to store the touched command line since the parameter | ||||||
| @@ -956,6 +979,7 @@ asmlinkage __visible void __init __no_sa | @@ -953,6 +976,7 @@ asmlinkage __visible void __init __no_sa | ||||||
|  	pr_notice("%s", linux_banner); |  	pr_notice("%s", linux_banner); | ||||||
|  	early_security_init(); |  	early_security_init(); | ||||||
|  	setup_arch(&command_line); |  	setup_arch(&command_line); | ||||||
|   | |||||||
| @@ -33,7 +33,7 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> | |||||||
|  |  | ||||||
| --- a/arch/arm/Kconfig | --- a/arch/arm/Kconfig | ||||||
| +++ b/arch/arm/Kconfig | +++ b/arch/arm/Kconfig | ||||||
| @@ -317,7 +317,7 @@ config ARCH_MULTIPLATFORM | @@ -318,7 +318,7 @@ config ARCH_MULTIPLATFORM | ||||||
|  	select ARCH_SELECT_MEMORY_MODEL |  	select ARCH_SELECT_MEMORY_MODEL | ||||||
|  	select ARM_HAS_SG_CHAIN |  	select ARM_HAS_SG_CHAIN | ||||||
|  	select ARM_PATCH_PHYS_VIRT |  	select ARM_PATCH_PHYS_VIRT | ||||||
|   | |||||||
| @@ -22,7 +22,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com> | |||||||
|  |  | ||||||
| --- a/arch/arm/Kconfig | --- a/arch/arm/Kconfig | ||||||
| +++ b/arch/arm/Kconfig | +++ b/arch/arm/Kconfig | ||||||
| @@ -1727,6 +1727,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN | @@ -1728,6 +1728,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN | ||||||
|  	  The command-line arguments provided by the boot loader will be |  	  The command-line arguments provided by the boot loader will be | ||||||
|  	  appended to the the device tree bootargs property. |  	  appended to the the device tree bootargs property. | ||||||
|   |   | ||||||
| @@ -248,7 +248,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com> | |||||||
|  } |  } | ||||||
| --- a/init/main.c | --- a/init/main.c | ||||||
| +++ b/init/main.c | +++ b/init/main.c | ||||||
| @@ -114,6 +114,10 @@ | @@ -112,6 +112,10 @@ | ||||||
|   |   | ||||||
|  #include <kunit/test.h> |  #include <kunit/test.h> | ||||||
|   |   | ||||||
| @@ -259,7 +259,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com> | |||||||
|  static int kernel_init(void *); |  static int kernel_init(void *); | ||||||
|   |   | ||||||
|  extern void init_IRQ(void); |  extern void init_IRQ(void); | ||||||
| @@ -993,6 +997,18 @@ asmlinkage __visible void __init __no_sa | @@ -990,6 +994,18 @@ asmlinkage __visible void __init __no_sa | ||||||
|  	pr_notice("Kernel command line: %s\n", saved_command_line); |  	pr_notice("Kernel command line: %s\n", saved_command_line); | ||||||
|  	/* parameters may set static keys */ |  	/* parameters may set static keys */ | ||||||
|  	jump_label_init(); |  	jump_label_init(); | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| --- a/arch/arm/Kconfig | --- a/arch/arm/Kconfig | ||||||
| +++ b/arch/arm/Kconfig | +++ b/arch/arm/Kconfig | ||||||
| @@ -1740,6 +1740,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGL | @@ -1741,6 +1741,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGL | ||||||
|   |   | ||||||
|  endchoice |  endchoice | ||||||
|   |   | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ Signed-off-by: Stefan Koch <stefan.koch10@gmail.com> | |||||||
|  |  | ||||||
| --- a/arch/mips/Kconfig | --- a/arch/mips/Kconfig | ||||||
| +++ b/arch/mips/Kconfig | +++ b/arch/mips/Kconfig | ||||||
| @@ -2430,6 +2430,12 @@ config MIPS_VPE_LOADER | @@ -2431,6 +2431,12 @@ config MIPS_VPE_LOADER | ||||||
|  	  Includes a loader for loading an elf relocatable object |  	  Includes a loader for loading an elf relocatable object | ||||||
|  	  onto another VPE and running it. |  	  onto another VPE and running it. | ||||||
|   |   | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| --- a/arch/arm/Kconfig | --- a/arch/arm/Kconfig | ||||||
| +++ b/arch/arm/Kconfig | +++ b/arch/arm/Kconfig | ||||||
| @@ -1729,6 +1729,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN | @@ -1730,6 +1730,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN | ||||||
|   |   | ||||||
|  endchoice |  endchoice | ||||||
|   |   | ||||||
|   | |||||||
| @@ -28,7 +28,7 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com> | |||||||
|  |  | ||||||
| --- a/arch/arm/Kconfig | --- a/arch/arm/Kconfig | ||||||
| +++ b/arch/arm/Kconfig | +++ b/arch/arm/Kconfig | ||||||
| @@ -1727,6 +1727,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN | @@ -1728,6 +1728,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN | ||||||
|  	  The command-line arguments provided by the boot loader will be |  	  The command-line arguments provided by the boot loader will be | ||||||
|  	  appended to the the device tree bootargs property. |  	  appended to the the device tree bootargs property. | ||||||
|   |   | ||||||
| @@ -247,7 +247,7 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com> | |||||||
|  } |  } | ||||||
| --- a/init/main.c | --- a/init/main.c | ||||||
| +++ b/init/main.c | +++ b/init/main.c | ||||||
| @@ -114,6 +114,10 @@ | @@ -112,6 +112,10 @@ | ||||||
|   |   | ||||||
|  #include <kunit/test.h> |  #include <kunit/test.h> | ||||||
|   |   | ||||||
| @@ -258,7 +258,7 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com> | |||||||
|  static int kernel_init(void *); |  static int kernel_init(void *); | ||||||
|   |   | ||||||
|  extern void init_IRQ(void); |  extern void init_IRQ(void); | ||||||
| @@ -991,6 +995,18 @@ asmlinkage __visible void __init __no_sa | @@ -988,6 +992,18 @@ asmlinkage __visible void __init __no_sa | ||||||
|  	page_alloc_init(); |  	page_alloc_init(); | ||||||
|   |   | ||||||
|  	pr_notice("Kernel command line: %s\n", saved_command_line); |  	pr_notice("Kernel command line: %s\n", saved_command_line); | ||||||
|   | |||||||
| @@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> | |||||||
|  |  | ||||||
| --- a/arch/mips/Kconfig | --- a/arch/mips/Kconfig | ||||||
| +++ b/arch/mips/Kconfig | +++ b/arch/mips/Kconfig | ||||||
| @@ -1181,6 +1181,10 @@ config MIPS_MSC | @@ -1182,6 +1182,10 @@ config MIPS_MSC | ||||||
|  config SYNC_R4K |  config SYNC_R4K | ||||||
|  	bool |  	bool | ||||||
|   |   | ||||||
|   | |||||||
| @@ -22,7 +22,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com> | |||||||
|  |  | ||||||
| --- a/arch/arm/Kconfig | --- a/arch/arm/Kconfig | ||||||
| +++ b/arch/arm/Kconfig | +++ b/arch/arm/Kconfig | ||||||
| @@ -1727,6 +1727,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN | @@ -1728,6 +1728,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN | ||||||
|  	  The command-line arguments provided by the boot loader will be |  	  The command-line arguments provided by the boot loader will be | ||||||
|  	  appended to the the device tree bootargs property. |  	  appended to the the device tree bootargs property. | ||||||
|   |   | ||||||
| @@ -228,7 +228,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com> | |||||||
|  } |  } | ||||||
| --- a/init/main.c | --- a/init/main.c | ||||||
| +++ b/init/main.c | +++ b/init/main.c | ||||||
| @@ -114,6 +114,10 @@ | @@ -112,6 +112,10 @@ | ||||||
|   |   | ||||||
|  #include <kunit/test.h> |  #include <kunit/test.h> | ||||||
|   |   | ||||||
| @@ -239,7 +239,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com> | |||||||
|  static int kernel_init(void *); |  static int kernel_init(void *); | ||||||
|   |   | ||||||
|  extern void init_IRQ(void); |  extern void init_IRQ(void); | ||||||
| @@ -991,6 +995,18 @@ asmlinkage __visible void __init __no_sa | @@ -988,6 +992,18 @@ asmlinkage __visible void __init __no_sa | ||||||
|  	page_alloc_init(); |  	page_alloc_init(); | ||||||
|   |   | ||||||
|  	pr_notice("Kernel command line: %s\n", saved_command_line); |  	pr_notice("Kernel command line: %s\n", saved_command_line); | ||||||
|   | |||||||
| @@ -17,7 +17,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net> | |||||||
|  |  | ||||||
| --- a/arch/mips/kernel/setup.c | --- a/arch/mips/kernel/setup.c | ||||||
| +++ b/arch/mips/kernel/setup.c | +++ b/arch/mips/kernel/setup.c | ||||||
| @@ -545,8 +545,28 @@ static int __init bootcmdline_scan_chose | @@ -547,8 +547,28 @@ static int __init bootcmdline_scan_chose | ||||||
|   |   | ||||||
|  #endif /* CONFIG_OF_EARLY_FLATTREE */ |  #endif /* CONFIG_OF_EARLY_FLATTREE */ | ||||||
|   |   | ||||||
| @@ -46,7 +46,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net> | |||||||
|  	bool dt_bootargs = false; |  	bool dt_bootargs = false; | ||||||
|   |   | ||||||
|  	/* |  	/* | ||||||
| @@ -560,6 +580,14 @@ static void __init bootcmdline_init(void | @@ -562,6 +582,14 @@ static void __init bootcmdline_init(void | ||||||
|  	} |  	} | ||||||
|   |   | ||||||
|  	/* |  	/* | ||||||
|   | |||||||
| @@ -10,7 +10,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> | |||||||
|  |  | ||||||
| --- a/arch/mips/kernel/setup.c | --- a/arch/mips/kernel/setup.c | ||||||
| +++ b/arch/mips/kernel/setup.c | +++ b/arch/mips/kernel/setup.c | ||||||
| @@ -687,7 +687,6 @@ static void __init arch_mem_init(char ** | @@ -689,7 +689,6 @@ static void __init arch_mem_init(char ** | ||||||
|  	mips_reserve_vmcore(); |  	mips_reserve_vmcore(); | ||||||
|   |   | ||||||
|  	mips_parse_crashkernel(); |  	mips_parse_crashkernel(); | ||||||
| @@ -18,7 +18,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> | |||||||
|   |   | ||||||
|  	/* |  	/* | ||||||
|  	 * In order to reduce the possibility of kernel panic when failed to |  	 * In order to reduce the possibility of kernel panic when failed to | ||||||
| @@ -804,6 +803,7 @@ void __init setup_arch(char **cmdline_p) | @@ -806,6 +805,7 @@ void __init setup_arch(char **cmdline_p) | ||||||
|   |   | ||||||
|  	cpu_cache_init(); |  	cpu_cache_init(); | ||||||
|  	paging_init(); |  	paging_init(); | ||||||
|   | |||||||
| @@ -25,7 +25,7 @@ Submitted-by: Birger Koblitz <git@birger-koblitz.de> | |||||||
|  platform-$(CONFIG_SGI_IP28)		+= sgi-ip22/ |  platform-$(CONFIG_SGI_IP28)		+= sgi-ip22/ | ||||||
| --- a/arch/mips/Kconfig | --- a/arch/mips/Kconfig | ||||||
| +++ b/arch/mips/Kconfig | +++ b/arch/mips/Kconfig | ||||||
| @@ -1054,8 +1054,58 @@ config NLM_XLP_BOARD | @@ -1055,8 +1055,58 @@ config NLM_XLP_BOARD | ||||||
|  	  This board is based on Netlogic XLP Processor. |  	  This board is based on Netlogic XLP Processor. | ||||||
|  	  Say Y here if you have a XLP based board. |  	  Say Y here if you have a XLP based board. | ||||||
|   |   | ||||||
|   | |||||||
| @@ -29,7 +29,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com> | |||||||
|  |  | ||||||
| --- a/arch/um/kernel/um_arch.c | --- a/arch/um/kernel/um_arch.c | ||||||
| +++ b/arch/um/kernel/um_arch.c | +++ b/arch/um/kernel/um_arch.c | ||||||
| @@ -130,7 +130,7 @@ static int have_root __initdata; | @@ -131,7 +131,7 @@ static int have_root __initdata; | ||||||
|  static int have_console __initdata; |  static int have_console __initdata; | ||||||
|   |   | ||||||
|  /* Set in uml_mem_setup and modified in linux_main */ |  /* Set in uml_mem_setup and modified in linux_main */ | ||||||
|   | |||||||
| @@ -66,6 +66,7 @@ CONFIG_CPU_SUP_INTEL=y | |||||||
| CONFIG_CPU_SUP_TRANSMETA_32=y | CONFIG_CPU_SUP_TRANSMETA_32=y | ||||||
| CONFIG_CPU_SUP_UMC_32=y | CONFIG_CPU_SUP_UMC_32=y | ||||||
| CONFIG_CPU_SUP_ZHAOXIN=y | CONFIG_CPU_SUP_ZHAOXIN=y | ||||||
|  | CONFIG_CPU_SRSO=y | ||||||
| CONFIG_CPU_UNRET_ENTRY=y | CONFIG_CPU_UNRET_ENTRY=y | ||||||
| CONFIG_CRASH_CORE=y | CONFIG_CRASH_CORE=y | ||||||
| CONFIG_CRC16=y | CONFIG_CRC16=y | ||||||
| @@ -116,6 +117,7 @@ CONFIG_FUSION=y | |||||||
| CONFIG_FUSION_MAX_SGE=128 | CONFIG_FUSION_MAX_SGE=128 | ||||||
| CONFIG_FUSION_SPI=y | CONFIG_FUSION_SPI=y | ||||||
| CONFIG_FW_LOADER_PAGED_BUF=y | CONFIG_FW_LOADER_PAGED_BUF=y | ||||||
|  | # CONFIG_GDS_FORCE_MITIGATION is not set | ||||||
| CONFIG_GENERIC_ALLOCATOR=y | CONFIG_GENERIC_ALLOCATOR=y | ||||||
| CONFIG_GENERIC_BUG=y | CONFIG_GENERIC_BUG=y | ||||||
| CONFIG_GENERIC_CLOCKEVENTS=y | CONFIG_GENERIC_CLOCKEVENTS=y | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user