From: Greg Kroah-Hartman Date: Mon, 6 May 2013 18:57:59 +0000 (-0700) Subject: 3.0-stable patches X-Git-Tag: v3.0.77~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee0020f98d1eebbbd30d3823f994e6ecb4c0c668;p=thirdparty%2Fkernel%2Fstable-queue.git 3.0-stable patches added patches: revert-can-sja1000-fix-handling-on-dt-properties-on-little-endian-systems.patch s390-move-dummy-io_remap_pfn_range-to-asm-pgtable.h.patch --- diff --git a/queue-3.0/revert-can-sja1000-fix-handling-on-dt-properties-on-little-endian-systems.patch b/queue-3.0/revert-can-sja1000-fix-handling-on-dt-properties-on-little-endian-systems.patch new file mode 100644 index 00000000000..634b1de7f16 --- /dev/null +++ b/queue-3.0/revert-can-sja1000-fix-handling-on-dt-properties-on-little-endian-systems.patch @@ -0,0 +1,85 @@ +From foo@baz Mon May 6 11:30:43 PDT 2013 +Date: Mon, 06 May 2013 11:30:43 -0700 +To: Greg KH +From: Greg Kroah-Hartman +Subject: Revert :can: sja1000: fix handling on dt properties on little endian systems" + +This reverts commit 55fe10a686c3a8bce7bddc149e4ebb12f5a18c25 which is +commit 0443de5fbf224abf41f688d8487b0c307dc5a4b4 upstream. + +This causes a build breakage on 3.0, so we shouldn't apply it to that +tree. + + +Reported-by: Jiri Slaby +Cc: Christoph Fritz +Cc: Marc Kleine-Budde +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/can/sja1000/sja1000_of_platform.c | 31 +++++++++++++------------- + 1 file changed, 16 insertions(+), 15 deletions(-) + +--- a/drivers/net/can/sja1000/sja1000_of_platform.c ++++ b/drivers/net/can/sja1000/sja1000_of_platform.c +@@ -93,8 +93,8 @@ static int __devinit sja1000_ofp_probe(s + struct net_device *dev; + struct sja1000_priv *priv; + struct resource res; +- u32 prop; +- int err, irq, res_size; ++ const u32 *prop; ++ int err, irq, res_size, prop_size; + void __iomem *base; + + err = of_address_to_resource(np, 0, &res); +@@ -135,27 +135,27 @@ static int __devinit sja1000_ofp_probe(s + priv->read_reg = sja1000_ofp_read_reg; + priv->write_reg = sja1000_ofp_write_reg; + +- err = of_property_read_u32(np, "nxp,external-clock-frequency", &prop); +- if (!err) +- priv->can.clock.freq = prop / 2; ++ prop = of_get_property(np, "nxp,external-clock-frequency", &prop_size); ++ if (prop && (prop_size == sizeof(u32))) ++ priv->can.clock.freq = *prop / 2; + else + priv->can.clock.freq = SJA1000_OFP_CAN_CLOCK; /* default */ + +- err = of_property_read_u32(np, "nxp,tx-output-mode", &prop); +- if (!err) +- priv->ocr |= prop & OCR_MODE_MASK; ++ prop = of_get_property(np, "nxp,tx-output-mode", &prop_size); ++ if (prop && (prop_size == sizeof(u32))) ++ priv->ocr |= *prop & OCR_MODE_MASK; + else + priv->ocr |= OCR_MODE_NORMAL; /* default */ + +- err = of_property_read_u32(np, "nxp,tx-output-config", &prop); +- if (!err) +- priv->ocr |= (prop << OCR_TX_SHIFT) & OCR_TX_MASK; ++ prop = of_get_property(np, "nxp,tx-output-config", &prop_size); ++ if (prop && (prop_size == sizeof(u32))) ++ priv->ocr |= (*prop << OCR_TX_SHIFT) & OCR_TX_MASK; + else + priv->ocr |= OCR_TX0_PULLDOWN; /* default */ + +- err = of_property_read_u32(np, "nxp,clock-out-frequency", &prop); +- if (!err && prop) { +- u32 divider = priv->can.clock.freq * 2 / prop; ++ prop = of_get_property(np, "nxp,clock-out-frequency", &prop_size); ++ if (prop && (prop_size == sizeof(u32)) && *prop) { ++ u32 divider = priv->can.clock.freq * 2 / *prop; + + if (divider > 1) + priv->cdr |= divider / 2 - 1; +@@ -165,7 +165,8 @@ static int __devinit sja1000_ofp_probe(s + priv->cdr |= CDR_CLK_OFF; /* default */ + } + +- if (!of_property_read_bool(np, "nxp,no-comparator-bypass")) ++ prop = of_get_property(np, "nxp,no-comparator-bypass", NULL); ++ if (!prop) + priv->cdr |= CDR_CBP; /* default */ + + priv->irq_flags = IRQF_SHARED; diff --git a/queue-3.0/s390-move-dummy-io_remap_pfn_range-to-asm-pgtable.h.patch b/queue-3.0/s390-move-dummy-io_remap_pfn_range-to-asm-pgtable.h.patch new file mode 100644 index 00000000000..1497b7a3770 --- /dev/null +++ b/queue-3.0/s390-move-dummy-io_remap_pfn_range-to-asm-pgtable.h.patch @@ -0,0 +1,45 @@ +From 4f2e29031e6c67802e7370292dd050fd62f337ee Mon Sep 17 00:00:00 2001 +From: Linus Torvalds +Date: Wed, 17 Apr 2013 08:46:19 -0700 +Subject: s390: move dummy io_remap_pfn_range() to asm/pgtable.h + +From: Linus Torvalds + +commit 4f2e29031e6c67802e7370292dd050fd62f337ee upstream. + +Commit b4cbb197c7e7 ("vm: add vm_iomap_memory() helper function") added +a helper function wrapper around io_remap_pfn_range(), and every other +architecture defined it in . + +The s390 choice of may make sense, but is not very convenient +for this case, and gratuitous differences like that cause unexpected errors like this: + + mm/memory.c: In function 'vm_iomap_memory': + mm/memory.c:2439:2: error: implicit declaration of function 'io_remap_pfn_range' [-Werror=implicit-function-declaration] + +Glory be the kbuild test robot who noticed this, bisected it, and +reported it to the guilty parties (ie me). + +Signed-off-by: Linus Torvalds +Cc: Martin Schwidefsky +Cc: Heiko Carstens +Cc: Jiri Slaby +Signed-off-by: Greg Kroah-Hartman + +--- + arch/s390/include/asm/pgtable.h | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/arch/s390/include/asm/pgtable.h ++++ b/arch/s390/include/asm/pgtable.h +@@ -67,6 +67,10 @@ static inline int is_zero_pfn(unsigned l + + #define my_zero_pfn(addr) page_to_pfn(ZERO_PAGE(addr)) + ++/* TODO: s390 cannot support io_remap_pfn_range... */ ++#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ ++ remap_pfn_range(vma, vaddr, pfn, size, prot) ++ + #endif /* !__ASSEMBLY__ */ + + /* diff --git a/queue-3.0/series b/queue-3.0/series index ef79844eb93..aaaae104d77 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -42,3 +42,5 @@ ext4-fix-kconfig-documentation-for-config_ext4_debug.patch x86-eliminate-irq_mis_count-counted-in-arch_irq_stat.patch mmc-core-fix-bit-width-test-failing-on-old-emmc-cards.patch mfd-adp5520-restore-mode-bits-on-resume.patch +s390-move-dummy-io_remap_pfn_range-to-asm-pgtable.h.patch +revert-can-sja1000-fix-handling-on-dt-properties-on-little-endian-systems.patch