Skip to content

Commit

Permalink
kernel update to 4.4.111/4.9.76/4.14.13
Browse files Browse the repository at this point in the history
  • Loading branch information
coolsnowwolf committed Jan 12, 2018
1 parent 5d5ba50 commit fe6ba73
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 30 deletions.
12 changes: 6 additions & 6 deletions include/kernel-version.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
LINUX_RELEASE?=1

LINUX_VERSION-3.18 = .71
LINUX_VERSION-4.4 = .110
LINUX_VERSION-4.9 = .75
LINUX_VERSION-4.14 = .12
LINUX_VERSION-4.4 = .111
LINUX_VERSION-4.9 = .76
LINUX_VERSION-4.14 = .13

LINUX_KERNEL_HASH-3.18.71 = 5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240
LINUX_KERNEL_HASH-4.4.110 = d099175aac5678e6cad2f23cd56ed22a2857143c0c18489390c95ba8c441db58
LINUX_KERNEL_HASH-4.9.75 = de6c31b7668d4047e370f4625362a02b9ebf7da56d5c0879a4961f620ab1cadf
LINUX_KERNEL_HASH-4.14.12 = 6608f7d480efc5c1078888e9344f4e0b0cd9bef0b6541cbdaec7d138e03856af
LINUX_KERNEL_HASH-4.4.111 = a201282e8eaf62b4f51edb2241e98ff805fe2d1b04a72a2328c5a6e2d77ec008
LINUX_KERNEL_HASH-4.9.76 = b82b94332cffaaeade74495264c989dafb96d4748503f87a5b7c436f5de887de
LINUX_KERNEL_HASH-4.14.13 = 4ab46d1b5a0f8ef83b80760f89ae4f5c88431b19b3cf79ffa0c66d6b33e45772

ifdef KERNEL_PATCHVER
LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER)))
Expand Down
4 changes: 2 additions & 2 deletions target/linux/generic/pending-4.4/204-module_strip.patch
Original file line number Diff line number Diff line change
Expand Up @@ -105,15 +105,15 @@ Signed-off-by: Felix Fietkau <[email protected]>
config MODULES_TREE_LOOKUP
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -2864,6 +2864,7 @@ static struct module *setup_load_info(st
@@ -2871,6 +2871,7 @@ static struct module *setup_load_info(st

static int check_modinfo(struct module *mod, struct load_info *info, int flags)
{
+#ifndef CONFIG_MODULE_STRIPPED
const char *modmagic = get_modinfo(info, "vermagic");
int err;

@@ -2889,6 +2890,7 @@ static int check_modinfo(struct module *
@@ -2900,6 +2901,7 @@ static int check_modinfo(struct module *
pr_warn("%s: module is from the staging directory, the quality "
"is unknown, you have been warned.\n", mod->name);
}
Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/pending-4.4/902-debloat_proc.patch
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
}
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -1556,10 +1556,12 @@ static int __init setup_vmstat(void)
@@ -1558,10 +1558,12 @@ static int __init setup_vmstat(void)
cpu_notifier_register_done();
#endif
#ifdef CONFIG_PROC_FS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -246,16 +246,16 @@ Signed-off-by: Yangbo Lu <[email protected]>
/* Restrict the stage to what we can actually support */
if (!(smmu->features & ARM_SMMU_FEAT_TRANS_S1))
smmu_domain->stage = ARM_SMMU_DOMAIN_S2;
@@ -1578,7 +1593,7 @@ static __le64 *arm_smmu_get_step_for_sid
@@ -1580,7 +1595,7 @@ static __le64 *arm_smmu_get_step_for_sid
return step;
}

-static int arm_smmu_install_ste_for_dev(struct iommu_fwspec *fwspec)
+static void arm_smmu_install_ste_for_dev(struct iommu_fwspec *fwspec)
{
int i;
int i, j;
struct arm_smmu_master_data *master = fwspec->iommu_priv;
@@ -1590,17 +1605,14 @@ static int arm_smmu_install_ste_for_dev(
@@ -1599,17 +1614,14 @@ static int arm_smmu_install_ste_for_dev(

arm_smmu_write_strtab_ent(smmu, sid, step, &master->ste);
}
Expand All @@ -275,7 +275,7 @@ Signed-off-by: Yangbo Lu <[email protected]>
}

static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev)
@@ -1619,7 +1631,7 @@ static int arm_smmu_attach_dev(struct io
@@ -1628,7 +1640,7 @@ static int arm_smmu_attach_dev(struct io
ste = &master->ste;

/* Already attached to a different domain? */
Expand All @@ -284,7 +284,7 @@ Signed-off-by: Yangbo Lu <[email protected]>
arm_smmu_detach_dev(dev);

mutex_lock(&smmu_domain->init_mutex);
@@ -1640,10 +1652,12 @@ static int arm_smmu_attach_dev(struct io
@@ -1649,10 +1661,12 @@ static int arm_smmu_attach_dev(struct io
goto out_unlock;
}

Expand All @@ -300,7 +300,7 @@ Signed-off-by: Yangbo Lu <[email protected]>
ste->s1_cfg = &smmu_domain->s1_cfg;
ste->s2_cfg = NULL;
arm_smmu_write_ctx_desc(smmu, ste->s1_cfg);
@@ -1652,10 +1666,7 @@ static int arm_smmu_attach_dev(struct io
@@ -1661,10 +1675,7 @@ static int arm_smmu_attach_dev(struct io
ste->s2_cfg = &smmu_domain->s2_cfg;
}

Expand All @@ -312,7 +312,7 @@ Signed-off-by: Yangbo Lu <[email protected]>
out_unlock:
mutex_unlock(&smmu_domain->init_mutex);
return ret;
@@ -1703,6 +1714,9 @@ arm_smmu_iova_to_phys(struct iommu_domai
@@ -1712,6 +1723,9 @@ arm_smmu_iova_to_phys(struct iommu_domai
struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
struct io_pgtable_ops *ops = smmu_domain->pgtbl_ops;

Expand All @@ -322,7 +322,7 @@ Signed-off-by: Yangbo Lu <[email protected]>
if (!ops)
return 0;

@@ -1801,7 +1815,7 @@ static void arm_smmu_remove_device(struc
@@ -1810,7 +1824,7 @@ static void arm_smmu_remove_device(struc
return;

master = fwspec->iommu_priv;
Expand All @@ -331,7 +331,7 @@ Signed-off-by: Yangbo Lu <[email protected]>
arm_smmu_detach_dev(dev);
iommu_group_remove_device(dev);
kfree(master);
@@ -1830,6 +1844,9 @@ static int arm_smmu_domain_get_attr(stru
@@ -1839,6 +1853,9 @@ static int arm_smmu_domain_get_attr(stru
{
struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);

Expand All @@ -341,7 +341,7 @@ Signed-off-by: Yangbo Lu <[email protected]>
switch (attr) {
case DOMAIN_ATTR_NESTING:
*(int *)data = (smmu_domain->stage == ARM_SMMU_DOMAIN_NESTED);
@@ -1845,6 +1862,9 @@ static int arm_smmu_domain_set_attr(stru
@@ -1854,6 +1871,9 @@ static int arm_smmu_domain_set_attr(stru
int ret = 0;
struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);

Expand All @@ -351,7 +351,7 @@ Signed-off-by: Yangbo Lu <[email protected]>
mutex_lock(&smmu_domain->init_mutex);

switch (attr) {
@@ -1874,6 +1894,31 @@ static int arm_smmu_of_xlate(struct devi
@@ -1883,6 +1903,31 @@ static int arm_smmu_of_xlate(struct devi
return iommu_fwspec_add_ids(dev, args->args, 1);
}

Expand Down Expand Up @@ -383,7 +383,7 @@ Signed-off-by: Yangbo Lu <[email protected]>
static struct iommu_ops arm_smmu_ops = {
.capable = arm_smmu_capable,
.domain_alloc = arm_smmu_domain_alloc,
@@ -1889,6 +1934,8 @@ static struct iommu_ops arm_smmu_ops = {
@@ -1898,6 +1943,8 @@ static struct iommu_ops arm_smmu_ops = {
.domain_get_attr = arm_smmu_domain_get_attr,
.domain_set_attr = arm_smmu_domain_set_attr,
.of_xlate = arm_smmu_of_xlate,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
}

static inline int is_buf_blank(uint8_t *buf, size_t len)
@@ -1856,9 +1842,7 @@ static int alloc_nand_resource(struct pl
@@ -1857,9 +1843,7 @@ static int alloc_nand_resource(struct pl
/* initialize all interrupts to be disabled */
disable_int(info, NDSR_MASK);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
@@ -684,6 +684,7 @@ static int cvm_oct_probe(struct platform
@@ -673,6 +673,7 @@ static int cvm_oct_probe(struct platform
int interface;
int fau = FAU_NUM_PACKET_BUFFERS_TO_FREE;
int qos;
+ int i;
struct device_node *pip;
int mtu_overhead = ETH_HLEN + ETH_FCS_LEN;

octeon_mdiobus_force_mod_depencency();
@@ -800,13 +801,19 @@ static int cvm_oct_probe(struct platform
@@ -796,13 +797,19 @@ static int cvm_oct_probe(struct platform
}

num_interfaces = cvmx_helper_get_number_of_interfaces();
Expand Down
8 changes: 4 additions & 4 deletions target/linux/octeon/patches-4.14/160-cmdline-hack.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
@@ -656,6 +656,35 @@ void octeon_user_io_init(void)
@@ -650,6 +650,35 @@ void octeon_user_io_init(void)
write_c0_derraddr1(0);
}

Expand Down Expand Up @@ -36,12 +36,12 @@
/**
* Early entry point for arch setup
*/
@@ -900,6 +929,8 @@ void __init prom_init(void)
@@ -894,6 +923,8 @@ void __init prom_init(void)
}
}

+ octeon_use_image_cmdline();
+
if (strstr(arcs_cmdline, "console=") == NULL) {
#ifdef CONFIG_CAVIUM_OCTEON_2ND_KERNEL
strcat(arcs_cmdline, " console=ttyS0,115200");
if (octeon_uart == 1)
strcat(arcs_cmdline, " console=ttyS1,115200");
2 changes: 1 addition & 1 deletion target/linux/octeon/patches-4.14/170-cisco-hack.patch
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Signed-off-by: Michał Osowiecki <[email protected]>

--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
@@ -1005,6 +1005,10 @@ void __init plat_mem_setup(void)
@@ -1018,6 +1018,10 @@ void __init plat_mem_setup(void)
if (mem_alloc_size > max_memory)
mem_alloc_size = max_memory;

Expand Down

0 comments on commit fe6ba73

Please sign in to comment.