mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Linux 3.11-rc7
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQEcBAABAgAGBQJSGqS5AAoJEHm+PkMAQRiGFxEH/3VrqF6WAkcviNiW/0DCdO8k v6Wi7Sp5LxVkwzmOCHCV1tTHwLRlH3cB9YmJlGQ0kHCREaAuEQAB0xJXIW7dnyYj Qq7KoRZEMe3wizmjEsj8qsrhfMLzHjBw67hBz2znwW/4P7YdgzwD7KRiEat+yRC9 ON3nNL2zIqpfk92RXvVrSVl4KMEM+WNbOfiffgBiEP24Ja1MJMFH1d4i6hNOaB0x 9Pb3Lw8let92x+8Ao5jnjKdKMgVsoZWbN/TgQR8zZOHM38AGGiDgk18vMz+L+hpS jqfjckxj1m30jGq0qZ9ZbMZx3IGif4KccVr30MqNHJpwi6Q24qXvT3YfA3HkstM= =nAab -----END PGP SIGNATURE----- Merge tag 'v3.11-rc7' into devicetree/next Linux 3.11-rc7
This commit is contained in:
commit
8be137f266
1120 changed files with 15002 additions and 9222 deletions
|
|
@ -392,6 +392,8 @@ static void __unflatten_device_tree(struct boot_param_header *blob,
|
|||
mem = (unsigned long)
|
||||
dt_alloc(size + 4, __alignof__(struct device_node));
|
||||
|
||||
memset((void *)mem, 0, size);
|
||||
|
||||
((__be32 *)mem)[size / 4] = cpu_to_be32(0xdeadbeef);
|
||||
|
||||
pr_debug(" unflattening %lx...\n", mem);
|
||||
|
|
|
|||
|
|
@ -345,6 +345,7 @@ int of_irq_to_resource(struct device_node *dev, int index, struct resource *r)
|
|||
if (r && irq) {
|
||||
const char *name = NULL;
|
||||
|
||||
memset(r, 0, sizeof(*r));
|
||||
/*
|
||||
* Get optional "interrupts-names" property to add a name
|
||||
* to the resource.
|
||||
|
|
@ -482,8 +483,9 @@ void __init of_irq_init(const struct of_device_id *matches)
|
|||
}
|
||||
|
||||
/* Get the next pending parent that might have children */
|
||||
desc = list_first_entry(&intc_parent_list, typeof(*desc), list);
|
||||
if (list_empty(&intc_parent_list) || !desc) {
|
||||
desc = list_first_entry_or_null(&intc_parent_list,
|
||||
typeof(*desc), list);
|
||||
if (!desc) {
|
||||
pr_err("of_irq_init: children remain, but no parents\n");
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue