forked from coolsnowwolf/lede
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
kernel update to 4.4.111/4.9.76/4.14.13
- Loading branch information
1 parent
5d5ba50
commit fe6ba73
Showing
8 changed files
with
30 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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); | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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); | ||
} | ||
|
@@ -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? */ | ||
|
@@ -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; | ||
} | ||
|
||
|
@@ -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; | ||
} | ||
|
||
|
@@ -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; | ||
|
||
|
@@ -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; | ||
|
@@ -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); | ||
|
||
|
@@ -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); | ||
|
||
|
@@ -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); | ||
} | ||
|
||
|
@@ -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, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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); | ||
|
||
|
6 changes: 3 additions & 3 deletions
6
target/linux/octeon/patches-4.14/110-er200-ethernet_probe_order.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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; | ||
|
||
|