Commit 4f8ad738 authored by David S. Miller's avatar David S. Miller
Browse files

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

parents 9049a40c fcdf818d

arch/sparc/kernel/cpumap.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ struct cpuinfo_tree { 


	/* Offsets into nodes[] for each level of the tree */

	struct cpuinfo_level level[CPUINFO_LVL_MAX];

	struct cpuinfo_node  nodes[0];

	struct cpuinfo_node  nodes[];

};

arch/sparc/kernel/ds.c

+4 −4
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ struct ds_reg_req { 
	__u64			handle;

	__u16			major;

	__u16			minor;

	char			svc_id[0];

	char			svc_id[];

};



struct ds_reg_ack {
@@ -701,12 +701,12 @@ struct ds_var_hdr { 


struct ds_var_set_msg {

	struct ds_var_hdr		hdr;

	char				name_and_value[0];

	char				name_and_value[];

};



struct ds_var_delete_msg {

	struct ds_var_hdr		hdr;

	char				name[0];

	char				name[];

};



struct ds_var_resp {
@@ -989,7 +989,7 @@ struct ds_queue_entry { 
	struct ds_info			*dp;

	int				req_len;

	int				__pad;

	u64				req[0];

	u64				req[];

};



static void process_ds_work(void)

arch/sparc/kernel/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ show_pciobppath_attr(struct device * dev, struct device_attribute * attr, char * 
	pdev = to_pci_dev(dev);

	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);

arch/sparc/kernel/vio.c

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ show_pciobppath_attr(struct device *dev, struct device_attribute *attr, 
	vdev = to_vio_dev(dev);

	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,

arch/sparc/mm/init_64.c

+5 −5
Original line number Diff line number Diff line
@@ -1674,29 +1674,29 @@ bool kern_addr_valid(unsigned long addr) 


	pgd = pgd_offset_k(addr);

	if (pgd_none(*pgd))

		return 0;

		return false;



	p4d = p4d_offset(pgd, addr);

	if (p4d_none(*p4d))

		return 0;

		return false;



	pud = pud_offset(p4d, addr);

	if (pud_none(*pud))

		return 0;

		return false;



	if (pud_large(*pud))

		return pfn_valid(pud_pfn(*pud));



	pmd = pmd_offset(pud, addr);

	if (pmd_none(*pmd))

		return 0;

		return false;



	if (pmd_large(*pmd))

		return pfn_valid(pmd_pfn(*pmd));



	pte = pte_offset_kernel(pmd, addr);

	if (pte_none(*pte))

		return 0;

		return false;



	return pfn_valid(pte_pfn(*pte));

}