kernel: bump 4.9 to 4.9.202
Refreshed all patches. Altered patches: - 902-debloat_proc.patch Compile-tested on: none Runtime-tested on: none Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
This commit is contained in:
		| @@ -6,11 +6,11 @@ ifdef CONFIG_TESTING_KERNEL | |||||||
|   KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) |   KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) | ||||||
| endif | endif | ||||||
|  |  | ||||||
| LINUX_VERSION-4.9 = .199 | LINUX_VERSION-4.9 = .202 | ||||||
| LINUX_VERSION-4.14 = .152 | LINUX_VERSION-4.14 = .152 | ||||||
| LINUX_VERSION-4.19 = .82 | LINUX_VERSION-4.19 = .82 | ||||||
|  |  | ||||||
| LINUX_KERNEL_HASH-4.9.199 = 0f2531f0908e320ee49954e8d84406db659073b202abc514bcc999ceaa3f7ed5 | LINUX_KERNEL_HASH-4.9.202 = 8108ec1cd10fc40821c84e9f087dba10b1767aad66596f4a36925faef55e4ebf | ||||||
| LINUX_KERNEL_HASH-4.14.152 = a9239fd9d341aae07b48a8e7a2afd528fe5cde2617d783454c71e6f3dae2b0aa | LINUX_KERNEL_HASH-4.14.152 = a9239fd9d341aae07b48a8e7a2afd528fe5cde2617d783454c71e6f3dae2b0aa | ||||||
| LINUX_KERNEL_HASH-4.19.82 = 58d96d6c2c5ee8288fe9714891e4037a18f457b008e369e33fc744afc2cb595d | LINUX_KERNEL_HASH-4.19.82 = 58d96d6c2c5ee8288fe9714891e4037a18f457b008e369e33fc744afc2cb595d | ||||||
|  |  | ||||||
|   | |||||||
| @@ -41,7 +41,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> | |||||||
|  |  | ||||||
| --- a/include/linux/gfp.h | --- a/include/linux/gfp.h | ||||||
| +++ b/include/linux/gfp.h | +++ b/include/linux/gfp.h | ||||||
| @@ -506,6 +506,8 @@ extern void free_hot_cold_page(struct pa | @@ -529,6 +529,8 @@ extern void free_hot_cold_page(struct pa | ||||||
|  extern void free_hot_cold_page_list(struct list_head *list, bool cold); |  extern void free_hot_cold_page_list(struct list_head *list, bool cold); | ||||||
|   |   | ||||||
|  struct page_frag_cache; |  struct page_frag_cache; | ||||||
|   | |||||||
| @@ -137,7 +137,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||||||
|   |   | ||||||
| --- a/drivers/net/can/c_can/c_can.c | --- a/drivers/net/can/c_can/c_can.c | ||||||
| +++ b/drivers/net/can/c_can/c_can.c | +++ b/drivers/net/can/c_can/c_can.c | ||||||
| @@ -1070,7 +1070,7 @@ static int c_can_poll(struct napi_struct | @@ -1079,7 +1079,7 @@ static int c_can_poll(struct napi_struct | ||||||
|   |   | ||||||
|  end: |  end: | ||||||
|  	if (work_done < quota) { |  	if (work_done < quota) { | ||||||
| @@ -668,7 +668,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||||||
|   |   | ||||||
| --- a/drivers/net/ethernet/hisilicon/hip04_eth.c | --- a/drivers/net/ethernet/hisilicon/hip04_eth.c | ||||||
| +++ b/drivers/net/ethernet/hisilicon/hip04_eth.c | +++ b/drivers/net/ethernet/hisilicon/hip04_eth.c | ||||||
| @@ -559,7 +559,7 @@ refill: | @@ -561,7 +561,7 @@ refill: | ||||||
|  		priv->reg_inten |= RCV_INT; |  		priv->reg_inten |= RCV_INT; | ||||||
|  		writel_relaxed(priv->reg_inten, priv->base + PPE_INTEN); |  		writel_relaxed(priv->reg_inten, priv->base + PPE_INTEN); | ||||||
|  	} |  	} | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  |  | ||||||
| --- a/Makefile | --- a/Makefile | ||||||
| +++ b/Makefile | +++ b/Makefile | ||||||
| @@ -1228,7 +1228,6 @@ all: modules | @@ -1240,7 +1240,6 @@ all: modules | ||||||
|   |   | ||||||
|  PHONY += modules |  PHONY += modules | ||||||
|  modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin |  modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin | ||||||
| @@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  	@$(kecho) '  Building modules, stage 2.'; |  	@$(kecho) '  Building modules, stage 2.'; | ||||||
|  	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost |  	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost | ||||||
|  	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild |  	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild | ||||||
| @@ -1258,7 +1257,6 @@ _modinst_: | @@ -1270,7 +1269,6 @@ _modinst_: | ||||||
|  		rm -f $(MODLIB)/build ; \ |  		rm -f $(MODLIB)/build ; \ | ||||||
|  		ln -s $(CURDIR) $(MODLIB)/build ; \ |  		ln -s $(CURDIR) $(MODLIB)/build ; \ | ||||||
|  	fi |  	fi | ||||||
|   | |||||||
| @@ -24,4 +24,4 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
| +#endif | +#endif | ||||||
|  	q->drop_batch_size = 64; |  	q->drop_batch_size = 64; | ||||||
|  	q->quantum = psched_mtu(qdisc_dev(sch)); |  	q->quantum = psched_mtu(qdisc_dev(sch)); | ||||||
|  	q->perturbation = prandom_u32(); |  	get_random_bytes(&q->perturbation, sizeof(q->perturbation)); | ||||||
|   | |||||||
| @@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|   */ |   */ | ||||||
| --- a/include/linux/skbuff.h | --- a/include/linux/skbuff.h | ||||||
| +++ b/include/linux/skbuff.h | +++ b/include/linux/skbuff.h | ||||||
| @@ -2339,6 +2339,10 @@ static inline int pskb_trim(struct sk_bu | @@ -2340,6 +2340,10 @@ static inline int pskb_trim(struct sk_bu | ||||||
|  	return (len < skb->len) ? __pskb_trim(skb, len) : 0; |  	return (len < skb->len) ? __pskb_trim(skb, len) : 0; | ||||||
|  } |  } | ||||||
|   |   | ||||||
| @@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  /** |  /** | ||||||
|   *	pskb_trim_unique - remove end from a paged unique (not cloned) buffer |   *	pskb_trim_unique - remove end from a paged unique (not cloned) buffer | ||||||
|   *	@skb: buffer to alter |   *	@skb: buffer to alter | ||||||
| @@ -2459,16 +2463,6 @@ static inline struct sk_buff *dev_alloc_ | @@ -2460,16 +2464,6 @@ static inline struct sk_buff *dev_alloc_ | ||||||
|  } |  } | ||||||
|   |   | ||||||
|   |   | ||||||
|   | |||||||
| @@ -249,10 +249,10 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  #endif |  #endif | ||||||
|  #ifdef CONFIG_PROC_FS |  #ifdef CONFIG_PROC_FS | ||||||
| -	proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations); | -	proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations); | ||||||
| -	proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops); | -	proc_create("pagetypeinfo", 0400, NULL, &pagetypeinfo_file_ops); | ||||||
| +	if (!IS_ENABLED(CONFIG_PROC_STRIPPED)) { | +	if (!IS_ENABLED(CONFIG_PROC_STRIPPED)) { | ||||||
| +		proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations); | +		proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations); | ||||||
| +		proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops); | +		proc_create("pagetypeinfo", 0400, NULL, &pagetypeinfo_file_ops); | ||||||
| +		proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations); | +		proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations); | ||||||
| +	} | +	} | ||||||
|  	proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations); |  	proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations); | ||||||
|   | |||||||
| @@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  |  | ||||||
| --- a/include/linux/skbuff.h | --- a/include/linux/skbuff.h | ||||||
| +++ b/include/linux/skbuff.h | +++ b/include/linux/skbuff.h | ||||||
| @@ -2303,7 +2303,7 @@ static inline int pskb_network_may_pull( | @@ -2304,7 +2304,7 @@ static inline int pskb_network_may_pull( | ||||||
|   * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8) |   * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8) | ||||||
|   */ |   */ | ||||||
|  #ifndef NET_SKB_PAD |  #ifndef NET_SKB_PAD | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Koen Vandeputte
					Koen Vandeputte