leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Browse Source
This commit is contained in:
David S. Miller
2020-06-07 17:11:41 -07:00
parent 9049a40c85 fcdf818d23
commit 4f8ad73898
6 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sparc/kernel/cpumap.c
View File

@@ -50,7 +50,7 @@ struct cpuinfo_tree {
/* Offsets into nodes[] for each level of the tree */ /* Offsets into nodes[] for each level of the tree */
struct cpuinfo_level level[CPUINFO_LVL_MAX]; struct cpuinfo_level level[CPUINFO_LVL_MAX];
struct cpuinfo_node nodes[0]; struct cpuinfo_node nodes[];
}; };

8
arch/sparc/kernel/ds.c
View File

@@ -87,7 +87,7 @@ struct ds_reg_req {
__u64 handle; __u64 handle;
__u16 major; __u16 major;
__u16 minor; __u16 minor;
char svc_id[0]; char svc_id[];
}; };
struct ds_reg_ack { struct ds_reg_ack {
@@ -701,12 +701,12 @@ struct ds_var_hdr {
struct ds_var_set_msg { struct ds_var_set_msg {
struct ds_var_hdr hdr; struct ds_var_hdr hdr;
char name_and_value[0]; char name_and_value[];
}; };
struct ds_var_delete_msg { struct ds_var_delete_msg {
struct ds_var_hdr hdr; struct ds_var_hdr hdr;
char name[0]; char name[];
}; };
struct ds_var_resp { struct ds_var_resp {
@@ -989,7 +989,7 @@ struct ds_queue_entry {
struct ds_info *dp; struct ds_info *dp;
int req_len; int req_len;
int __pad; int __pad;
u64 req[0]; u64 req[];
}; };
static void process_ds_work(void) static void process_ds_work(void)

2
arch/sparc/kernel/pci.c
View File

@@ -593,7 +593,7 @@ show_pciobppath_attr(struct device * dev, struct device_attribute * attr, char *
pdev = to_pci_dev(dev); pdev = to_pci_dev(dev);
dp = pdev->dev.of_node; dp = pdev->dev.of_node;
return snprintf (buf, PAGE_SIZE, "%pOF\n", dp); return scnprintf(buf, PAGE_SIZE, "%pOF\n", dp);
} }
static DEVICE_ATTR(obppath, S_IRUSR | S_IRGRP | S_IROTH, show_pciobppath_attr, NULL); static DEVICE_ATTR(obppath, S_IRUSR | S_IRGRP | S_IROTH, show_pciobppath_attr, NULL);

2
arch/sparc/kernel/vio.c
View File

@@ -193,7 +193,7 @@ show_pciobppath_attr(struct device *dev, struct device_attribute *attr,
vdev = to_vio_dev(dev); vdev = to_vio_dev(dev);
dp = vdev->dp; dp = vdev->dp;
return snprintf (buf, PAGE_SIZE, "%pOF\n", dp); return scnprintf(buf, PAGE_SIZE, "%pOF\n", dp);
} }
static DEVICE_ATTR(obppath, S_IRUSR | S_IRGRP | S_IROTH, static DEVICE_ATTR(obppath, S_IRUSR | S_IRGRP | S_IROTH,

10
arch/sparc/mm/init_64.c
View File

@@ -1674,29 +1674,29 @@ bool kern_addr_valid(unsigned long addr)
pgd = pgd_offset_k(addr); pgd = pgd_offset_k(addr);
if (pgd_none(*pgd)) if (pgd_none(*pgd))
return 0; return false;
p4d = p4d_offset(pgd, addr); p4d = p4d_offset(pgd, addr);
if (p4d_none(*p4d)) if (p4d_none(*p4d))
return 0; return false;
pud = pud_offset(p4d, addr); pud = pud_offset(p4d, addr);
if (pud_none(*pud)) if (pud_none(*pud))
return 0; return false;
if (pud_large(*pud)) if (pud_large(*pud))
return pfn_valid(pud_pfn(*pud)); return pfn_valid(pud_pfn(*pud));
pmd = pmd_offset(pud, addr); pmd = pmd_offset(pud, addr);
if (pmd_none(*pmd)) if (pmd_none(*pmd))
return 0; return false;
if (pmd_large(*pmd)) if (pmd_large(*pmd))
return pfn_valid(pmd_pfn(*pmd)); return pfn_valid(pmd_pfn(*pmd));
pte = pte_offset_kernel(pmd, addr); pte = pte_offset_kernel(pmd, addr);
if (pte_none(*pte)) if (pte_none(*pte))
return 0; return false;
return pfn_valid(pte_pfn(*pte)); return pfn_valid(pte_pfn(*pte));
} }

1
drivers/tty/vcc.c
View File

@@ -605,6 +605,7 @@ static int vcc_probe(struct vio_dev *vdev, const struct vio_device_id *id)
port->index = vcc_table_add(port); port->index = vcc_table_add(port);
if (port->index == -1) { if (port->index == -1) {
pr_err("VCC: no more TTY indices left for allocation\n"); pr_err("VCC: no more TTY indices left for allocation\n");
rv = -ENOMEM;
goto free_ldc; goto free_ldc;
} }