Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (83bdd240) · Commits · 戴 / test

arch/sparc/kernel/kstack.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,10 @@ static inline bool kstack_valid(struct thread_info *tp, unsigned long sp)
		{
		unsigned long base = (unsigned long) tp;

		/* Stack pointer must be 16-byte aligned. */
		if (sp & (16UL - 1))
		return false;

		if (sp >= (base + sizeof(struct thread_info)) &&
		sp <= (base + THREAD_SIZE - sizeof(struct sparc_stackf)))
		return true;

+1 −1

Original line number	Diff line number	Diff line
		@@ -105,7 +105,7 @@ static unsigned long of_bus_sbus_get_flags(const u32 *addr, unsigned long flags)

		static int of_bus_ambapp_match(struct device_node *np)
		{
		return !strcmp(np->name, "ambapp");
		return !strcmp(np->type, "ambapp");
		}

		static void of_bus_ambapp_count_cells(struct device_node *child,

+7 −0

Original line number	Diff line number	Diff line
		@@ -247,6 +247,7 @@ static struct pci_dev of_create_pci_dev(struct pci_pbm_info pbm,
		struct pci_bus *bus, int devfn)
		{
		struct dev_archdata *sd;
		struct pci_slot *slot;
		struct of_device *op;
		struct pci_dev *dev;
		const char *type;
		@@ -286,6 +287,11 @@ static struct pci_dev of_create_pci_dev(struct pci_pbm_info pbm,
		dev->dev.bus = &pci_bus_type;
		dev->devfn = devfn;
		dev->multifunction = 0; /* maybe a lie? */
		set_pcie_port_type(dev);

		list_for_each_entry(slot, &dev->bus->slots, list)
		if (PCI_SLOT(dev->devfn) == slot->number)
		dev->slot = slot;

		dev->vendor = of_getintprop_default(node, "vendor-id", 0xffff);
		dev->device = of_getintprop_default(node, "device-id", 0xffff);
		@@ -322,6 +328,7 @@ static struct pci_dev of_create_pci_dev(struct pci_pbm_info pbm,

		dev->current_state = 4; /* unknown power state */
		dev->error_state = pci_channel_io_normal;
		dev->dma_mask = 0xffffffff;

		if (!strcmp(node->name, "pci")) {
		/* a PCI-PCI bridge */

+4 −2