)]}' { "log": [ { "commit": "25985edcedea6396277003854657b5f3cb31a628", "tree": "f026e810210a2ee7290caeb737c23cb6472b7c38", "parents": [ "6aba74f2791287ec407e0f92487a725a25908067" ], "author": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Wed Mar 30 22:57:33 2011 -0300" }, "committer": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Thu Mar 31 11:26:23 2011 -0300" }, "message": "Fix common misspellings\n\nFixes generated by \u0027codespell\u0027 and manually reviewed.\n\nSigned-off-by: Lucas De Marchi \u003clucas.demarchi@profusion.mobi\u003e\n" }, { "commit": "85eb1513c15652cdaa9fd656345825bf55514a96", "tree": "b445b8d6d9184a897a2656a9f16a6ec592137644", "parents": [ "e122996ae1edf2caf19643cb79366fc2117a6188", "b43d151e9679a06df896ac3db65a9dca80040fed" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 30 07:50:45 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 30 07:50:45 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027for-linus\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm: (65 commits)\n ARM: 6826/1: Merge v6 and v7 DEBUG_LL DCC support\n ARM: 6838/1: etm: fix section mismatch warning\n ARM: 6837/1: remove unused pci_fixup_prpmc1100\n ARM: 6836/1: kprobes/fix emulation of LDR/STR instruction when Rn \u003d\u003d PC\n Fix the broken build for Marvell Dove platform.\n ARM: 6835/1: perf: ensure overflows aren\u0027t missed due to IRQ latency\n ARM: 6834/1: perf: reset counters on all CPUs during initialisation\n ARM: 6833/1: perf: add required isbs() to ARMv7 backend\n ARM: 6825/1: kernel/sleep.S: fix Thumb2 compilation issues\n ARM: 6807/1: realview: Fix secondary GIC initialisation for EB with MPCore tile\n arm: mach-mx3: pcm043: add write-protect and card-detect for SD1\n eukrea_mbimxsd51: add SD Card detect\n eukrea_mbimxsd25-baseboard: add SD card detect\n mx3/eukrea_mbimxsd-baseboard: add SD card detect support\n mx3/eukrea_mbimxsd-baseboard: fix gpio request\n ARM: mxs/mx28evk: add mmc device\n ARM: mxs/mx23evk: add mmc device\n ARM: mxs: dynamically allocate mmc device\n ARM: mx51_efika: update platform data for new mfd changes\n mx2/iomux: Set direction for CSPI2 pins\n ...\n" }, { "commit": "f38c02f3b338651e145aac2889ba976baf6b28b3", "tree": "30cfbf42ccff4a9dc26d95e9058ec76f5fde78bb", "parents": [ "9323f26186403433293e87e717a7785f74f75d80" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu Mar 24 13:35:09 2011 +0100" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Mar 29 14:47:58 2011 +0200" }, "message": "arm: Fold irq_set_chip/irq_set_handler\n\nUse irq_set_chip_and_handler() instead. Converted with coccinelle.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "6845664a6a7d443f03883db59d10749d38d98b8e", "tree": "4b4499f4d41f24152190220d93ea186fbf991fca", "parents": [ "25a5662a13e604d86b0a9fd71703582a7393d8ec" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu Mar 24 13:25:22 2011 +0100" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Mar 29 14:47:57 2011 +0200" }, "message": "arm: Cleanup the irq namespace\n\nConvert to the new function names. Automated with coccinelle.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "25a5662a13e604d86b0a9fd71703582a7393d8ec", "tree": "a7974715b7e08fff416fdf0300fdad19b45cd8bf", "parents": [ "cf0d6b76c11b565f8d8b7d527d17b9f82eb3b3a5" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu Mar 24 12:02:11 2011 +0100" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Mar 29 14:47:57 2011 +0200" }, "message": "arm: Use generic show_interrupts()\n\nUse the generic version and just keep the arch specific output.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "1b7a2d90c83bec624ac89f0642cb57bed17a2d3d", "tree": "2543ac3b3b4b0dfc73d45a013e21d587d273ec47", "parents": [ "1475b85d08b51b5ee2b7b426247d3ef3f531eafe" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon Feb 07 22:30:49 2011 +0100" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Mar 29 14:47:52 2011 +0200" }, "message": "arm: Use irq flag setter function\n\nUse the proper accessor function instead of fiddling in the status\nbits directly.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: linux-arm-kernel@lists.infradead.org\n" }, { "commit": "11f2cde1165b56c88701954088437a556ddff07f", "tree": "e3eabfe30b3c62d8c60efa578721d6a6b53b3e18", "parents": [ "cd22c0e44b105aecd78e5f9e77abab3a1b8dc00c" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sun Mar 27 19:45:00 2011 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Mar 29 14:47:50 2011 +0200" }, "message": "arm: bios32: Remove non exisiting machine code\n\nThe id removal left this machine check in which breaks the build on\nsome platforms. Remove it.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "dfad549d98b60160547d1b8299051b9456c8da85", "tree": "3920e4931669c67e0f06955dfc667ee3aa0d566c", "parents": [ "8e8806990cfd91a4ec25df6f00528008c4b0087a" ], "author": { "name": "Stephen Boyd", "email": "sboyd@codeaurora.org", "time": "Wed Mar 23 22:46:15 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Mar 28 19:01:43 2011 +0100" }, "message": "ARM: 6826/1: Merge v6 and v7 DEBUG_LL DCC support\n\nThe inline assembly differences for v6 vs. v7 are purely\noptimizations. On a v7 processor, an mrc with the pc sets the\ncondition codes to the 28-31 bits of the register being read. It\njust so happens that the TX/RX full bits the DCC support code is\ntesting for are high enough in the register to be put into the\ncondition codes. On a v6 processor, this \"feature\" isn\u0027t\nimplemented and thus we have to do the usual read, mask, test\noperations to check for TX/RX full. Thus, we can drop the v7\nimplementation and just use the v6 implementation for both.\n\nCc: Tony Lindgren \u003ctony@atomide.com\u003e\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "8e8806990cfd91a4ec25df6f00528008c4b0087a", "tree": "ad20f635cd2b762319d137d9d47d08bd39fb183c", "parents": [ "7f479c64a52094354c10309fcacaa71de015dc9e" ], "author": { "name": "Ming Lei", "email": "tom.leiming@gmail.com", "time": "Mon Mar 28 06:10:25 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Mar 28 19:01:17 2011 +0100" }, "message": "ARM: 6838/1: etm: fix section mismatch warning\n\nThe patch fixes the warning below:\n\nWARNING: arch/arm/kernel/built-in.o(.data+0x27c): Section mismatch in reference from the variable etb_driver to the function .init.text:etb_probe()\nThe variable etb_driver references\nthe function __init etb_probe()\nIf the reference is valid then annotate the\nvariable with __init* or __refdata (see linux/init.h) or name the variable:\n*_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console,\n\nWARNING: arch/arm/kernel/built-in.o(.data+0x2cc): Section mismatch in reference from the variable etm_driver to the function .init.text:etm_probe()\nThe variable etm_driver references\nthe function __init etm_probe()\nIf the reference is valid then annotate the\nvariable with __init* or __refdata (see linux/init.h) or name the variable:\n*_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console,\n\nSigned-off-by: Ming Lei \u003ctom.leiming@gmail.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "7f479c64a52094354c10309fcacaa71de015dc9e", "tree": "3871f6fb7ea21c23529fe45897fe34fc1297dfea", "parents": [ "0652f067360fc3be2c3e668085f5fb2b76402928" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Sun Mar 27 00:45:25 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Mar 28 19:01:17 2011 +0100" }, "message": "ARM: 6837/1: remove unused pci_fixup_prpmc1100\n\nThe PrPMC1100 machine was removed in 2.6.11, but left a reference to machine_is_prpmc1100 in arch/arm/kernel/bios32.c. 6f82f4db80189281a8ac42f2e72396accb719b57 removed the machine type, which causes a build failure:\n\nCC arch/arm/kernel/bios32.o\narch/arm/kernel/bios32.c: In function \u0027pci_fixup_prpmc1100\u0027:\narch/arm/kernel/bios32.c:174: error: implicit declaration of function \u0027machine_is_prpmc1100\u0027\n\nRemove the unused pci_fixup_prpcm1100.\n\nSigned-off-by: Colin Cross \u003cccross@android.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "0652f067360fc3be2c3e668085f5fb2b76402928", "tree": "5ce7272e70266f50a0701bd6d1ce13abd4d451b4", "parents": [ "255bae73b214f143a3c7cc74d4792eb166a10d46" ], "author": { "name": "Viktor Rosendahl", "email": "viktor.rosendahl@nokia.com", "time": "Sat Mar 26 18:11:01 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Mar 28 19:01:16 2011 +0100" }, "message": "ARM: 6836/1: kprobes/fix emulation of LDR/STR instruction when Rn \u003d\u003d PC\n\nThe Rn value from the emulation is unconditionally written back;\nthis is fine as long as Rn !\u003d PC because in that case, even if the\ninstruction isn\u0027t a write back instruction, it will only result in the\nsame value being written back.\n\nIn case Rn \u003d\u003d PC, then the emulated instruction doesn\u0027t have the\nactual PC value in Rn but an adjusted value; when this is written\nback, it will result in the PC being incorrectly updated.\n\nAn altenative solution would be to check bits 24 and 22 to see whether\nthe instruction actually is a write back instruction or not. I think\nit\u0027s enough to check whether Rn !\u003d PC, because:\n- it\u0027s looks cheaper than the alternative\n- to my understaning it\u0027s not permitted to update the PC with a write\nback instruction, so we don\u0027t lose any ability to emulate legal\ninstructions.\n- in case of writing back for non write back instructions where Rn !\u003d PC, it doesn\u0027t matter because the values are the same.\n\nRegarding the second point above, it would possibly be prudent to add\nsome checking to prep_emulate_ldr_str(), so that instructions with\nboth write back and Rn \u003d\u003d PC would be rejected.\n\nSigned-off-by: Viktor Rosendahl \u003cviktor.rosendahl@nokia.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "a737823d37666255e3e74ce84bc9611a038e0888", "tree": "0424691dc1af593e08877cb1ee2b2e59334f532f", "parents": [ "574b69cbb633037a9c305d2993aeb680f4a8badd" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Fri Mar 25 17:12:37 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Mar 26 10:06:09 2011 +0000" }, "message": "ARM: 6835/1: perf: ensure overflows aren\u0027t missed due to IRQ latency\n\nIf a counter overflows during a perf stat profiling run it may overtake\nthe last known value of the counter:\n\n 0 prev new 0xffffffff\n |----------|-------|----------------------|\n\nIn this case, the number of events that have occurred is\n(0xffffffff - prev) + new. Unfortunately, the event update code will\nnot realise an overflow has occurred and will instead report the event\ndelta as (new - prev) which may be considerably smaller than the real\ncount.\n\nThis patch adds an extra argument to armpmu_event_update which indicates\nwhether or not an overflow has occurred. If an overflow has occurred\nthen we use the maximum period of the counter to calculate the elapsed\nevents.\n\nAcked-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\nReported-by: Ashwin Chaugule \u003cashwinc@codeaurora.org\u003e\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "574b69cbb633037a9c305d2993aeb680f4a8badd", "tree": "8fcef55167b8750eeaebffca51b937a993842136", "parents": [ "d25d3b4c4d0e27975ee659a64b6d29f02fdbfde4" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Fri Mar 25 13:13:34 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Mar 26 10:06:09 2011 +0000" }, "message": "ARM: 6834/1: perf: reset counters on all CPUs during initialisation\n\nARMv7 dictates that the interrupt-enable and count-enable registers for\neach PMU counter are UNKNOWN following core reset.\n\nThis patch adds a new (optional) function pointer to struct arm_pmu for\nresetting the PMU state during init. The reset function is called on\neach CPU via an arch_initcall in the generic ARM perf_event code and\nallows the PMU backend to write sane values to any UNKNOWN registers.\n\nAcked-by: Jean Pihet \u003cj-pihet@ti.com\u003e\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "d25d3b4c4d0e27975ee659a64b6d29f02fdbfde4", "tree": "649a912d82c53b372389eea0e4ea29f3a85bf201", "parents": [ "fb4fe87d79511398a68000d2100c825f54b51652" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Fri Mar 25 13:12:23 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Mar 26 10:06:09 2011 +0000" }, "message": "ARM: 6833/1: perf: add required isbs() to ARMv7 backend\n\nThe ARMv7 architecture does not guarantee that effects from co-processor\nwrites are immediately visible to following instructions.\n\nThis patch adds two isbs to the ARMv7 perf code:\n\n(1) Immediately after selecting an event register, so that the PMU state\n following this instruction is consistent with the new event.\n\n(2) Immediately before writing to the PMCR, so that any previous writes\n to the PMU have taken effect before (typically) enabling the\n counters.\n\nAcked-by: Jean Pihet \u003cj-pihet@ti.com\u003e\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "fb4fe87d79511398a68000d2100c825f54b51652", "tree": "fdf59957c11cc784c8795f2628114d83ed686a1a", "parents": [ "0efc48ecaf0f84430524a1759ab9c60aad8eab1e" ], "author": { "name": "Nicolas Pitre", "email": "nicolas.pitre@linaro.org", "time": "Tue Mar 22 19:09:14 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Mar 26 10:06:08 2011 +0000" }, "message": "ARM: 6825/1: kernel/sleep.S: fix Thumb2 compilation issues\n\nSigned-off-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nReviewed-by: Dave Martin \u003cdave.martin@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "2f284c846331fa44be1300a3c2c3e85800268a00", "tree": "be2704e6157613bd2cc2a278559a6c86a0b644f4", "parents": [ "93a72052be81823fa1584b9be037d51924f9efa4", "6f82f4db80189281a8ac42f2e72396accb719b57" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 23 20:37:26 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 23 20:37:26 2011 -0700" }, "message": "Merge branch \u0027devel\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027devel\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm: (35 commits)\n ARM: Update (and cut down) mach-types\n ARM: 6771/1: vexpress: add support for multiple core tiles\n ARM: 6797/1: hw_breakpoint: Fix newlines in WARNings\n ARM: 6751/1: vexpress: select applicable errata workarounds in Kconfig\n ARM: 6753/1: omap4: Enable ARM local timers with OMAP4430 es1.0 exception\n ARM: 6759/1: smp: Select local timers vs broadcast timer support runtime\n ARM: pgtable: add pud-level code\n ARM: 6673/1: LPAE: use phys_addr_t instead of unsigned long for start of membanks\n ARM: Use long long format when printing meminfo physical addresses\n ARM: integrator: add Integrator/CP sched_clock support\n ARM: realview/vexpress: consolidate SMP bringup code\n ARM: realview/vexpress: consolidate localtimer support\n ARM: integrator/versatile: consolidate FPGA IRQ handling code\n ARM: rationalize versatile family Kconfig/Makefile\n ARM: realview: remove old AMBA device DMA definitions\n ARM: versatile: remove old AMBA device DMA definitions\n ARM: vexpress: use new init_early for clock tree and sched_clock init\n ARM: realview: use new init_early for clock tree and sched_clock init\n ARM: versatile: use new init_early for clock tree and sched_clock init\n ARM: integrator: use new init_early for clock tree init\n ...\n" }, { "commit": "93a72052be81823fa1584b9be037d51924f9efa4", "tree": "4f5c824c8fe3fb737e27b91bfd60c10d092dc3e9", "parents": [ "8547727756a7322b99aa313ce50fe15d8f858872" ], "author": { "name": "Olaf Hering", "email": "olaf@aepfle.de", "time": "Wed Mar 23 16:43:29 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 23 19:47:19 2011 -0700" }, "message": "crash_dump: export is_kdump_kernel to modules, consolidate elfcorehdr_addr, setup_elfcorehdr and saved_max_pfn\n\nThe Xen PV drivers in a crashed HVM guest can not connect to the dom0\nbackend drivers because both frontend and backend drivers are still in\nconnected state. To run the connection reset function only in case of a\ncrashdump, the is_kdump_kernel() function needs to be available for the PV\ndriver modules.\n\nConsolidate elfcorehdr_addr, setup_elfcorehdr and saved_max_pfn into\nkernel/crash_dump.c Also export elfcorehdr_addr to make is_kdump_kernel()\nusable for modules.\n\nLeave \u0027elfcorehdr\u0027 as early_param(). This changes powerpc from __setup()\nto early_param(). It adds an address range check from x86 also on ia64\nand powerpc.\n\n[akpm@linux-foundation.org: additional #includes]\n[akpm@linux-foundation.org: remove elfcorehdr_addr export]\n[akpm@linux-foundation.org: fix for Tejun\u0027s mm/nobootmem.c changes]\nSigned-off-by: Olaf Hering \u003colaf@aepfle.de\u003e\nCc: Russell King \u003crmk@arm.linux.org.uk\u003e\nCc: \"Luck, Tony\" \u003ctony.luck@intel.com\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "196f020fbbb83d246960548e73a40fd08f3e7866", "tree": "aed9fa4c32938a4502eb8971dce18f74f0059162", "parents": [ "6d7ed21d17e640b120b902a314143e5ef4917a70", "7d85d61f6ad6e2d6a14b5c20369bc9569f634855", "516295e5ab4bf986865cfff856d484ec678e3b0b", "3de4ade3d696db31d1543dce585ba6296f876612" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Mar 20 09:32:12 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Mar 20 09:32:12 2011 +0000" }, "message": "Merge branches \u0027fixes\u0027, \u0027pgt-next\u0027 and \u0027versatile\u0027 into devel\n" }, { "commit": "411f5c7a502769ccc0377c5ba36cb0b283847ba8", "tree": "2c3a29671e3f923de48c55f94194849264a7bf53", "parents": [ "6d7ed21d17e640b120b902a314143e5ef4917a70", "9ced9f03d12d7539e86b0bff5bc750153c976c34" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 19:08:06 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 19:08:06 2011 -0700" }, "message": "Merge branch \u0027devel-stable\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027devel-stable\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm: (289 commits)\n davinci: DM644x EVM: register MUSB device earlier\n davinci: add spi devices on tnetv107x evm\n davinci: add ssp config for tnetv107x evm board\n davinci: add tnetv107x ssp platform device\n spi: add ti-ssp spi master driver\n mfd: add driver for sequencer serial port\n ARM: EXYNOS4: Implement Clock gating for System MMU\n ARM: EXYNOS4: Enhancement of System MMU driver\n ARM: EXYNOS4: Add support for gpio interrupts\n ARM: S5P: Add function to register gpio interrupt bank data\n ARM: S5P: Cleanup S5P gpio interrupt code\n ARM: EXYNOS4: Add missing GPYx banks\n ARM: S3C64XX: Fix section mismatch from cpufreq init\n ARM: EXYNOS4: Add keypad device to the SMDKV310\n ARM: EXYNOS4: Update clocks for keypad\n ARM: EXYNOS4: Update keypad base address\n ARM: EXYNOS4: Add keypad device helpers\n ARM: EXYNOS4: Add support for SATA on ARMLEX4210\n plat-nomadik: make GPIO interrupts work with cpuidle ApSleep\n mach-u300: define a dummy filter function for coh901318\n ...\n\nFix up various conflicts in\n - arch/arm/mach-exynos4/cpufreq.c\n - arch/arm/mach-mxs/gpio.c\n - drivers/net/Kconfig\n - drivers/tty/serial/Kconfig\n - drivers/tty/serial/Makefile\n - drivers/usb/gadget/fsl_mxc_udc.c\n - drivers/video/Kconfig\n" }, { "commit": "6d7ed21d17e640b120b902a314143e5ef4917a70", "tree": "87d00d7057dd9c57175f3367715d18b1958f096a", "parents": [ "ec0afc9311adcfb10b90e547c23250f63939f990", "bafc8205dc7bf2488175008deedc14ff4939d174", "9c9585e0e96f8340d704256db00b2ec28240c36e", "bfddc1c325d1e092d9fb1b5b03a05b818f82d35f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 18:48:35 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 18:48:35 2011 -0700" }, "message": "Merge branches \u0027defcfg\u0027, \u0027drivers\u0027 and \u0027cyberpro-next\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027defcfg\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm:\n ARM: 6647/1: add Versatile Express defconfig\n ARM: 6644/1: mach-ux500: update the U8500 defconfig\n\n* \u0027drivers\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm:\n ARM: 6764/1: pl011: factor out FIFO to TTY code\n ARM: 6763/1: pl011: add optional RX DMA to PL011 v2\n ARM: 6758/1: amba: support pm ops\n ARM: amba: make amba_driver id_table const\n ARM: amba: make internal ID table handling const\n ARM: amba: make probe() functions take const id tables\n ARM: 6662/1: amba: make amba_bustype non-static\n ARM: mmci: add dmaengine-based DMA support\n ARM: mmci: no need for separate host-\u003edata_xfered\n ARM: mmci: avoid unnecessary switch to data available PIO interrupts\n ARM: mmci: no need to call flush_dcache_page() with sg_miter API\n ARM: mmci: avoid reporting too many completed bytes on fifo overrun\n ALSA: AACI: make fifo variables more explanitory\n ALSA: AACI: no need to call snd_pcm_period_elapsed() for each period\n ALSA: AACI: use snd_pcm_lib_period_bytes()\n ALSA: AACI: clean up AACI announcement printk\n ALSA: AACI: fix channel mask selection\n ALSA: AACI: fix number of channels for record\n ALSA: AACI: fix multiple IRQ claiming\n\n* \u0027cyberpro-next\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm:\n VIDEO: cyberpro: remove unused cyber2000fb_get_fb_var()\n VIDEO: cyberpro: remove useless function extreg pointers\n VIDEO: cyberpro: update handling of device structures\n VIDEO: cyberpro: add support for video capture I2C\n VIDEO: cyberpro: make \u0027reg_b0_lock\u0027 always present\n VIDEO: cyberpro: add I2C support\n VIDEO: cyberpro: select lowest multipler/divisor for PLL\n" }, { "commit": "9c9585e0e96f8340d704256db00b2ec28240c36e", "tree": "e644bda53c5a1c36a4066c09601566bf20e88ad1", "parents": [ "5d350cba486de34eff99d0394d8fb436af54522e", "c8ebae37034c0ead62eb4df8ef88e999ddb8d5cf", "ba74ec7f6b2bf9e1b5d0f2c5cef08766944cb2c8", "29772c4e28cbb33ea1f8c6dcd130ebf190b91d85" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Mar 17 11:04:51 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Mar 17 11:04:51 2011 +0000" }, "message": "Merge branches \u0027aaci\u0027, \u0027mmci-dma\u0027, \u0027pl\u0027 and \u0027pl011\u0027 into drivers\n" }, { "commit": "16d8775700f1815076f879719ce14b33f50a3171", "tree": "8525e6e6f12b6acf7cf2746853cc65549f3dbf4c", "parents": [ "e34551339a195aa548eaf698523714a8fe7f1984", "05e34754518b6a90d5c392790c032575fab12d66" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 19:03:06 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 19:03:06 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027for-linus\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm: (91 commits)\n ARM: 6806/1: irq: introduce entry and exit functions for chained handlers\n ARM: 6781/1: Thumb-2: Work around buggy Thumb-2 short branch relocations in gas\n ARM: 6747/1: P2V: Thumb2 support\n ARM: 6798/1: aout-core: zero thread debug registers in a.out core dump\n ARM: 6796/1: Footbridge: Fix I/O mappings for NOMMU mode\n ARM: 6784/1: errata: no automatic Store Buffer drain on Cortex-A9\n ARM: 6772/1: errata: possible fault MMU translations following an ASID switch\n ARM: 6776/1: mach-ux500: activate fix for errata 753970\n ARM: 6794/1: SPEAr: Append UL to device address macros.\n ARM: 6793/1: SPEAr: Remove unused *_SIZE macros from spear*.h files\n ARM: 6792/1: SPEAr: Replace SIZE macro\u0027s with SZ_4K macros\n ARM: 6791/1: SPEAr3xx: Declare device structures after shirq code\n ARM: 6790/1: SPEAr: Clock Framework: Rename usbd clock and align apb_clk entry\n ARM: 6789/1: SPEAr3xx: Rename sdio to sdhci\n ARM: 6788/1: SPEAr: Include mach/hardware.h instead of mach/spear.h\n ARM: 6787/1: SPEAr: Reorder #includes in .h \u0026 .c files.\n ARM: 6681/1: SPEAr: add debugfs support to clk API\n ARM: 6703/1: SPEAr: update clk API support\n ARM: 6679/1: SPEAr: make clk API functions more generic\n ARM: 6737/1: SPEAr: formalized timer support\n ...\n" }, { "commit": "05e34754518b6a90d5c392790c032575fab12d66", "tree": "318d321262269eff585573ab2acf04a2ff2b65f4", "parents": [ "bd1274dc005c2cee41771a7cc616f4709a6e6323", "b511d75d6150892e67c8ebfa9dc8eb37ebd02aa3" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Mar 16 23:35:27 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Mar 16 23:35:27 2011 +0000" }, "message": "Merge branch \u0027p2v\u0027 into devel\n\nConflicts:\n\tarch/arm/kernel/module.c\n\tarch/arm/mach-s5pv210/sleep.S\n" }, { "commit": "bd1274dc005c2cee41771a7cc616f4709a6e6323", "tree": "fcfe103a499ca9e3d8fa0ecbca5b7d0d274da5ca", "parents": [ "1f0090a1eaa1b750a2fc5c99c91b790d5322a1fd", "3ba6e69ad887f8a814267ed36fd4bfbddf8855a9" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Mar 16 23:35:26 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Mar 16 23:35:26 2011 +0000" }, "message": "Merge branch \u0027v6v7\u0027 into devel\n\nConflicts:\n\tarch/arm/include/asm/cacheflush.h\n\tarch/arm/include/asm/proc-fns.h\n\tarch/arm/mm/Kconfig\n" }, { "commit": "1f0090a1eaa1b750a2fc5c99c91b790d5322a1fd", "tree": "c685060f260410e6704c9dfd457ed8c347141f1d", "parents": [ "2472f3c8d8fc18b25b2cf1574c036e238187c0ff", "10a8c3839810ac9af1aec836d61b92e7a879f5fa" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Mar 16 23:35:25 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Mar 16 23:35:25 2011 +0000" }, "message": "Merge branch \u0027misc\u0027 into devel\n\nConflicts:\n\tarch/arm/Kconfig\n" }, { "commit": "2472f3c8d8fc18b25b2cf1574c036e238187c0ff", "tree": "485458b51ef0b5509376b56e6ff2e1b124f9c048", "parents": [ "d081377dfda42beab13d8b4af876571ce7661174", "31bb68a314e9a2c9fbe054441b18c0608585605e", "5dab26af1bacad9a7189d904fbc8b4fe8e95dd81", "4e8d76373c9fd7a1c1b401fc97ba01c0ecbb888f", "b6338bdc8305b27688a7feb8689e4ccfd42f0292", "f512626f5baf09c1d40d098462a986417f4e9790", "bf0c11183fc3a2acce56d2b53f2a117322bd3c3b", "941aefac4c243cf407d7665d3e64beb32d556acf", "f45b1149911cc4c3ab50e56c8844ad4ec04a4575", "981a95d37126cdf09e1dba3884305c2e25375bfb", "6e266b204b853b960ad038e62f31c1671f930b87", "21f47fbc5b18da4a3db680959aee887612ec9a72" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Mar 16 23:35:17 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Mar 16 23:35:17 2011 +0000" }, "message": "Merge branches \u0027at91\u0027, \u0027ep93xx\u0027, \u0027errata\u0027, \u0027footbridge\u0027, \u0027fncpy\u0027, \u0027gemini\u0027, \u0027irqdata\u0027, \u0027pm\u0027, \u0027sh\u0027, \u0027smp\u0027, \u0027spear\u0027, \u0027ux500\u0027 and \u0027via\u0027 into devel\n" }, { "commit": "79d8a8f736151b12129984b1250fd708440e742c", "tree": "f67eebe2bafca8820955ee9f851985a41fb32e66", "parents": [ "bd2895eeade5f11f3e5906283c630bbdb4b57454", "b9ec40af0e18fb7d02106be148036c2ea490fdf9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 08:22:41 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 08:22:41 2011 -0700" }, "message": "Merge branch \u0027for-2.6.39\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu\n\n* \u0027for-2.6.39\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:\n percpu, x86: Add arch-specific this_cpu_cmpxchg_double() support\n percpu: Generic support for this_cpu_cmpxchg_double()\n alpha: use L1_CACHE_BYTES for cacheline size in the linker script\n percpu: align percpu readmostly subsection to cacheline\n\nFix up trivial conflict in arch/x86/kernel/vmlinux.lds.S due to the\npercpu alignment having changed (\"x86: Reduce back the alignment of the\nper-CPU data section\")\n" }, { "commit": "420c1c572d4ceaa2f37b6311b7017ac6cf049fe2", "tree": "df04e6b4b756b7a46d9887462d54a3ad0e1f91d5", "parents": [ "9620639b7ea3843983f4ced8b4c81eb4d8974838", "6e6823d17b157f185be09f4c70181299f9273f0b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 15 18:53:35 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 15 18:53:35 2011 -0700" }, "message": "Merge branch \u0027timers-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (62 commits)\n posix-clocks: Check write permissions in posix syscalls\n hrtimer: Remove empty hrtimer_init_hres_timer()\n hrtimer: Update hrtimer-\u003estate documentation\n hrtimer: Update base[CLOCK_BOOTTIME].offset correctly\n timers: Export CLOCK_BOOTTIME via the posix timers interface\n timers: Add CLOCK_BOOTTIME hrtimer base\n time: Extend get_xtime_and_monotonic_offset() to also return sleep\n time: Introduce get_monotonic_boottime and ktime_get_boottime\n hrtimers: extend hrtimer base code to handle more then 2 clockids\n ntp: Remove redundant and incorrect parameter check\n mn10300: Switch do_timer() to xtimer_update()\n posix clocks: Introduce dynamic clocks\n posix-timers: Cleanup namespace\n posix-timers: Add support for fd based clocks\n x86: Add clock_adjtime for x86\n posix-timers: Introduce a syscall for clock tuning.\n time: Splitout compat timex accessors\n ntp: Add ADJ_SETOFFSET mode bit\n time: Introduce timekeeping_inject_offset\n posix-timer: Update comment\n ...\n\nFix up new system-call-related conflicts in\n\tarch/x86/ia32/ia32entry.S\n\tarch/x86/include/asm/unistd_32.h\n\tarch/x86/include/asm/unistd_64.h\n\tarch/x86/kernel/syscall_table_32.S\n(name_to_handle_at()/open_by_handle_at() vs clock_adjtime()), and some\ndue to movement of get_jiffies_64() in:\n\tkernel/time.c\n" }, { "commit": "8688a1a8637c6b833b9b70148809db4538352d2e", "tree": "7b5d6c2d83c8bd1686811501c6287a650c40751b", "parents": [ "3afdb0f3528991de0833224f2dba60dc061e01fa", "f91f9cd505f92e4227ffda7e5799a33d4f34bf36" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Mar 12 20:33:51 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Mar 12 20:33:51 2011 +0000" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-tcc into devel-stable\n" }, { "commit": "b511d75d6150892e67c8ebfa9dc8eb37ebd02aa3", "tree": "0cec12cd64edeecac2b737f2788b012eab538285", "parents": [ "80f0aad77f3e1e9d9e518b09ac46963d628ae2be" ], "author": { "name": "Nicolas Pitre", "email": "nicolas.pitre@linaro.org", "time": "Mon Feb 21 06:53:35 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Mar 10 16:43:45 2011 +0000" }, "message": "ARM: 6747/1: P2V: Thumb2 support\n\nAdding Thumb2 support to the runtime patching of the virt_to_phys and\nphys_to_virt opcodes.\n\nTested both the 8-bit and the 16-bit fixups, using different placements\nin memory to exercize all code paths.\n\nSigned-off-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nReviewed-by: Dave Martin \u003cdave.martin@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "7d85d61f6ad6e2d6a14b5c20369bc9569f634855", "tree": "db1bb932b38b54901b1d3aca6824a41c189fe86b", "parents": [ "35d34df711e8b44846e759d8cfddb4ec6877cccb" ], "author": { "name": "Stephen Boyd", "email": "sboyd@codeaurora.org", "time": "Thu Mar 10 05:15:00 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Mar 10 10:03:45 2011 +0000" }, "message": "ARM: 6797/1: hw_breakpoint: Fix newlines in WARNings\n\nThese warnings are missing newlines and spaces causing confusing\nlooking output when they trigger.\n\nAcked-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "71d8c5b11e3b5936ae6c2e0b1dd6f5c78b305b65", "tree": "c815434adc34cb7274ef6a0ee16cf8491fa0c03e", "parents": [ "0fff6b9a4e0aba233a2ff644316d29b0cb784e33", "53936c56dcaf1db818fe953ae05592a8b5e345b5" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Mar 06 08:42:55 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Mar 06 08:42:55 2011 +0000" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable\n" }, { "commit": "868d172b8ac23070418ec6265195e88e8d5dbe92", "tree": "7e7b0b853c92c6ed96c8d61828ab0c4fe3cd4cb4", "parents": [ "e25bac968d41d994e5295f89547bdff6cb40588a" ], "author": { "name": "Eric Cooper", "email": "ecc@cmu.edu", "time": "Wed Feb 02 17:16:09 2011 -0500" }, "committer": { "name": "Nicolas Pitre", "email": "nico@fluxnic.net", "time": "Thu Mar 03 16:26:55 2011 -0500" }, "message": "[ARM] add machine-specific hook to machine_kexec\n\nProvide the option to call a machine-specific function\nbefore kexec\u0027ing a new kernel.\n\nSigned-off-by: Eric Cooper \u003cecc@cmu.edu\u003e\nSigned-off-by: Nicolas Pitre \u003cnico@fluxnic.net\u003e\n" }, { "commit": "c09bae709182046ab104757115dfbd74a1ba1a15", "tree": "4abb05c23dd1846666c327d4ccb8aa3458b6f44a", "parents": [ "ba55d3db9bb59a52fe45dbc5d62776adbb289e54" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Fri Feb 25 20:20:42 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Feb 26 13:35:51 2011 +0000" }, "message": "ARM: 6768/1: hw_breakpoint: ensure debug logic is powered up on v7 cores\n\nARMv7 allows the debug core logic to be powered down and provides the\nDBGPRSR register so that software can power-up and check the status of\nthe logic.\n\nThis patch ensures that the debug logic is powered up on ARMv7 cores\nbefore we attempt to access the extended debug registers.\n\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "ba55d3db9bb59a52fe45dbc5d62776adbb289e54", "tree": "0d48b0655efde424085a15f83c15ecde4603df32", "parents": [ "8f3112707fabc2f9f932a4ac1c5b92f3266e4662" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Fri Feb 25 20:19:32 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Feb 26 13:35:50 2011 +0000" }, "message": "ARM: 6767/1: ptrace: fix register indexing in GETHBPREGS request\n\nThe GETHBPREGS ptrace request incorrectly maps its index argument onto\nthe thread\u0027s saved debug state when the index !\u003d 0. This has not yet\nbeen seen from userspace because GDB (the only user of this request)\nonly reads from register 0.\n\nThis patch fixes the indexing.\n\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "af90f10d3826525306c96d423df240210640cb72", "tree": "1b4e2fa6e483b0bb9ced44a9e36a9dceff384c8e", "parents": [ "d77e270c53a4911d23ded9f4ab8b175a3fe3bb34" ], "author": { "name": "Santosh Shilimkar", "email": "santosh.shilimkar@ti.com", "time": "Wed Feb 23 18:53:15 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Feb 23 17:54:27 2011 +0000" }, "message": "ARM: 6759/1: smp: Select local timers vs broadcast timer support runtime\n\nThe current code support of dummy timers in absence of local\ntimer is compile time. This is an attempt to convert it to runtime\nso that on few SOC version if the local timers aren\u0027t supported\nkernel can switch to dummy timers. OMAP4430 ES1.0 does suffer from\nthis limitation.\n\nThis patch should not have any functional impact on affected\nfiles.\n\nCc: Daniel Walker \u003cdwalker@codeaurora.org\u003e\nCc: Bryan Huntsman \u003cbryanh@codeaurora.org\u003e\nCc: Tony Lindgren \u003ctony@atomide.com\u003e\nCc: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Magnus Damm \u003cmagnus.damm@gmail.com\u003e\nCc: Colin Cross \u003cccross@android.com\u003e\nCc: Erik Gilling \u003ckonkers@android.com\u003e\nCc: Srinidhi Kasagar \u003csrinidhi.kasagar@stericsson.com\u003e\nCc: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Santosh Shilimkar \u003csantosh.shilimkar@ti.com\u003e\nAcked-by: David Brown \u003cdavidb@codeaurora.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "425fc47adb5bb69f76285be77a09a3341a30799e", "tree": "aa1fab1e90520f80573445c77b55db8446e3570c", "parents": [ "5637a126482026b37d426d76e1b18f748f309aaa" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Mon Feb 14 14:31:09 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Feb 23 17:24:22 2011 +0000" }, "message": "ARM: 6668/1: ptrace: remove single-step emulation code\n\nPTRACE_SINGLESTEP is a ptrace request designed to offer single-stepping\nsupport to userspace when the underlying architecture has hardware\nsupport for this operation.\n\nOn ARM, we set arch_has_single_step() to 1 and attempt to emulate hardware\nsingle-stepping by disassembling the current instruction to determine the\nnext pc and placing a software breakpoint on that location.\n\nUnfortunately this has the following problems:\n\n1.) Only a subset of ARMv7 instructions are supported\n2.) Thumb-2 is unsupported\n3.) The code is not SMP safe\n\nWe could try to fix this code, but it turns out that because of the above\nissues it is rarely used in practice. GDB, for example, uses PTRACE_POKETEXT\nand PTRACE_PEEKTEXT to manage breakpoints itself and does not require any\nkernel assistance.\n\nThis patch removes the single-step emulation code from ptrace meaning that\nthe PTRACE_SINGLESTEP request will return -EIO on ARM. Portable code must\ncheck the return value from a ptrace call and handle the failure gracefully.\n\nAcked-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "617912440bf20497d23d01ab58076998aced3f15", "tree": "69bc841621171decddfd96c060cfa404184fdd2e", "parents": [ "1dbfa187dad57d3e17207328ec8bd2d90b4177d2" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Jan 23 12:09:36 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Feb 23 17:24:16 2011 +0000" }, "message": "ARM: irq migration: ensure migration is handled safely\n\nEnsure appropriate locks are taken to ensure that IRQ migration off\nthe current CPU is race-free. We may have a concurrent set_affinity\nvia procfs running on another CPU in parallel with the IRQ migration,\nresulting in unpredictable results.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "1dbfa187dad57d3e17207328ec8bd2d90b4177d2", "tree": "403ecdd08b80de952150999d39ab46a3d280a01f", "parents": [ "a9f43c113d7435441fb024d265aecacc4f623f5e" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Jan 23 12:08:16 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Feb 23 17:24:15 2011 +0000" }, "message": "ARM: irq migration: force migration off CPU going down\n\nThe force argument to irq_set_affinity really should be \u0027true\u0027 as\nmoving IRQs off a CPU which is going down isn\u0027t optional.\n\nAcked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "a9f43c113d7435441fb024d265aecacc4f623f5e", "tree": "35ed8febf3994aaac8f0c9a076242fe295650364", "parents": [ "68e6fad488ef21335529c65ca6c88c38be50cd3a" ], "author": { "name": "Colin Tuckley", "email": "colin.tuckley@arm.com", "time": "Thu Jan 06 11:16:49 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Feb 23 17:24:14 2011 +0000" }, "message": "ARM: 6608/1: enable bridges in pci_common_init.\n\nAdd a missing call to pci_enable_bridges() so that devices behind\nbridges get found by the pci bus scan.\n\nSigned-off-by: Chris Partington \u003cchris.partington@arm.com\u003e\nAcked-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "68e6fad488ef21335529c65ca6c88c38be50cd3a", "tree": "a9ca2d10ee703bbc4ccff79385bd0ee95dcbc29b", "parents": [ "a65d29225ed884456f3d34dcefd3a18df24af03b" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jan 11 19:57:14 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Feb 23 17:24:14 2011 +0000" }, "message": "ARM: improve module relocation fixup diagnostics\n\nCurrent diagnostics are rather poor when things go wrong:\n ipv6: relocation out of range, section 2 reloc 0 sym \u0027snmp_mib_free\u0027\n\nLet\u0027s include a little more information about the problem:\n ipv6: section 2 reloc 0 sym \u0027snmp_mib_free\u0027: relocation 28 out of range (0xbf0000a4 -\u003e 0xc11b4858)\n\nso that we show exactly what the problem is - not only what type of\nrelocation but also the offending address range too.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "2bbd7e9b74271b2d6a14b4840fc44afbea83774d", "tree": "7666eeaeefe43a616ece6bf189a3be8fa78e9c35", "parents": [ "459c1517f9873b198af7dcded8d8cc84749bbb69" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Jan 08 12:05:09 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Feb 23 17:24:12 2011 +0000" }, "message": "ARM: fix some sparse errors in generic ARM code\n\narch/arm/kernel/return_address.c:37:6: warning: symbol \u0027return_address\u0027 was not declared. Should it be static?\narch/arm/kernel/setup.c:76:14: warning: symbol \u0027processor_id\u0027 was not declared. Should it be static?\narch/arm/kernel/traps.c:259:1: warning: symbol \u0027die_lock\u0027 was not declared. Should it be static?\narch/arm/vfp/vfpmodule.c:156:6: warning: symbol \u0027vfp_raise_sigfpe\u0027 was not declared. Should it be static?\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "aa25afad2ca60d19457849ea75e9c31236f4e174", "tree": "24c8c815caf191af56f8de287637087c298711b2", "parents": [ "394d5aefcdecb51bbf7d6df757e73559c9692a08" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Feb 19 15:55:00 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Feb 23 16:24:14 2011 +0000" }, "message": "ARM: amba: make probe() functions take const id tables\n\nMake Primecell driver probe functions take a const pointer to their\nID tables. Drivers should never modify their ID tables in their\nprobe handler.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "3572bea8cbc57f0bef1e0f4580c01717df7026d8", "tree": "aa48782419dad9dbd005783ff7af349e980b1de4", "parents": [ "dce72dd08c976c9e5e1367bf994b306b15ae87fe" ], "author": { "name": "Nicolas Pitre", "email": "nicolas.pitre@linaro.org", "time": "Mon Feb 21 06:57:33 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Feb 23 16:14:25 2011 +0000" }, "message": "ARM: 6748/1: ignore mdesc-\u003eboot_params if out of range\n\nThe initial MMU table created in head.S contains a 1 MB mapping at the\nstart of memory to let the early kernel boot code access the boot params\nspecified by mdesc-\u003eboot_params.\n\nWhen using CONFIG_ARM_PATCH_PHYS_VIRT it is possible for the kernel to\nhave a different idea of where the start of memory is at run time, making\nthe compile-time determined mdesc-\u003eboot_params pointing to a memory area\nwhich is not mapped. Any access to the boot params in that case will\nfault and silently hang the kernel at that point. It is therefore a\nbetter idea to simply ignore mdesc-\u003eboot_params in that case and give\nthe kernel a chance to print some diagnostic on the console later.\n\nIf the bootloader provides a valid pointer in r2 to the kernel then this\nis used instead of mdesc-\u003eboot_params, and an explicit mapping is already\ncreated in the initial MMU table for it. It is therefore a good idea to\nuse that facility when using a relocated kernel.\n\nSigned-off-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "dce72dd08c976c9e5e1367bf994b306b15ae87fe", "tree": "3713d0935cf6d5c9c3a642ef9b851fd41b4f4dd8", "parents": [ "3a6b1676c6f27f7fad1a3d6fab5a95f90b1e7402" ], "author": { "name": "Nicolas Pitre", "email": "nicolas.pitre@linaro.org", "time": "Mon Feb 21 07:00:32 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Feb 23 16:13:17 2011 +0000" }, "message": "ARM: 6749/1: fold lookup_machine_type() into setup_machine()\n\nSince commit 6fc31d54 there is no callers for lookup_machine_type()\nother than setup_machine(). And if the former fails it won\u0027t return,\ntherefore the error path in the later is dead code. Let\u0027s clean\nthings up by merging them together.\n\nSigned-off-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "941aefac4c243cf407d7665d3e64beb32d556acf", "tree": "1e43bde1d1c50d028f8c677f396fa95f194b2687", "parents": [ "2e2f3d3792de5913897b6bb49ac13915b0b020d5" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Feb 11 11:32:19 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Feb 22 17:11:26 2011 +0000" }, "message": "ARM: pm: allow generic sleep code to be used with SMP CPU idle\n\nAllow the generic sleep code to be used with SMP CPU idle by storing\nN CPU stack pointers rather than just one. Tested on Assabet and\nTegra 2.\n\nTested-by: Colin Cross \u003cccross@android.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "f6b0fa02e8b0708d17d631afce456524eadf87ff", "tree": "900fcd2149a03ba229bb29e982d3d6a5f3d3fcfc", "parents": [ "753790e713d80b50b867fa1ed32ec0eb5e82ae8e" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Feb 06 15:48:39 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Feb 22 17:11:23 2011 +0000" }, "message": "ARM: pm: add generic CPU suspend/resume support\n\nThis adds core support for saving and restoring CPU coprocessor\nregisters for suspend/resume support. This contains support for suspend\nwith ARM920, ARM926, SA11x0, PXA25x, PXA27x, PXA3xx, V6 and V7 CPUs.\nTested on Assabet and Tegra 2.\n\nTested-by: Colin Cross \u003cccross@android.com\u003e\nTested-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "5a5af730536fbf15fc354980cba2a0400afa6b76", "tree": "80e84fc65496e03bcdf0f5c6ce2d3ae2db54fabc", "parents": [ "58e9c47fa0dd76693b2c85c010c7430a4de77c6d" ], "author": { "name": "Nicolas Pitre", "email": "nicolas.pitre@linaro.org", "time": "Mon Feb 21 04:37:20 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Feb 21 19:29:29 2011 +0000" }, "message": "ARM: 6745/1: kprobes insn decoding fix\n\nMarcin Slusarz says:\n\n\u003e In arch/arm/kernel/kprobes-decode.c there\u0027s a function\n\u003e arm_kprobe_decode_insn which does:\n\u003e\n\u003e } else if ((insn \u0026 0x0e000000) \u003d\u003d 0x0c400000) {\n\u003e ...\n\u003e\n\u003e This is always false, so code below is dead.\n\u003e I found this bug by coccinelle (http://coccinelle.lip6.fr/).\n\nReported-by: Marcin Slusarz \u003cmarcin.slusarz@gmail.com\u003e\nSigned-off-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "a9ad21fed09cb95d34af9474be0831525b30c4c6", "tree": "1e92e37f401c08b6950d4df29e7c68ec0866d20e", "parents": [ "53399053eb505cf541b2405bd9d9bca5ecfb96fb" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Feb 21 10:13:36 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Feb 21 19:29:27 2011 +0000" }, "message": "ARM: Keep exit text/data around for SMP_ON_UP\n\nWhen SMP_ON_UP is used and the spinlocks are inlined, we end up with\ninline spinlocks in the exit code, with references from the SMP\nalternatives section to the exit sections. This causes link time\nerrors. Avoid this by placing the exit sections in the init-discarded\nregion.\n\nCc: \u003cstable@kernel.org\u003e\nTested-by: Dave Martin \u003cdave.martin@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "53399053eb505cf541b2405bd9d9bca5ecfb96fb", "tree": "05b7fff7b081592087df18449dd6dd72537e522d", "parents": [ "dc810efb0ca5702c9d96782b99282d4b4383e877" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Feb 20 12:22:52 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Feb 21 19:29:26 2011 +0000" }, "message": "ARM: Ensure predictable endian state on signal handler entry\n\nEnsure a predictable endian state when entering signal handlers. This\navoids programs which use SETEND to momentarily switch their endian\nstate from having their signal handlers entered with an unpredictable\nendian state.\n\nCc: \u003cstable@kernel.org\u003e\nAcked-by: Dave Martin \u003cdave.martin@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "dc810efb0ca5702c9d96782b99282d4b4383e877", "tree": "85237820baf61398b53057207fe8bf5014742841", "parents": [ "167879ae8924540660b187d759956f316dd6e8fe" ], "author": { "name": "Pawel Moll", "email": "pawel.moll@arm.com", "time": "Wed Feb 16 18:54:01 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Feb 21 19:29:25 2011 +0000" }, "message": "ARM: 6740/1: Place correctly notes section in the linker script\n\nCommit 18991197b4b588255ccabf472ebc84db7b66a19c added --build-id\nlinker option when toolchain supports it. ARM one does, but for some\nreason places the section at 0 when linker script doesn\u0027t mention it\nexplicitly.\n\nThe 1e621a8e3752367d4aae78a8ab00a18fb2793f34 worked around the problem\nremoving this section from binary image with explicit objcopy options,\nbut it still exists in vmlinux, confusing tools like debuggers and perf.\n\nThis problem was discussed here:\nhttp://lists.infradead.org/pipermail/linux-arm-kernel/2010-May/015994.html\nhttp://lists.infradead.org/pipermail/linux-arm-kernel/2010-May/015994.html\nbut the proposed changes to the linker script were substantial.\n\nThis patch simply places NOTES (36 bytes long, at least when compiled\nwith CodeSourcery toolchain) between data and bss, which seem to be\nthe right place (and suggested by the sample linker script in\ninclude/asm-generic/vmlinux.lds.h).\n\nIt is enough to place it correctly in vmlinux (so debuggers are happy):\n\nSection Headers:\n [11] .data PROGBITS c07ce000 7ce000 020fc0 00 WA 0 0 32\n [12] .notes NOTE c07eefc0 7eefc0 000024 00 AX 0 0 4\n [13] .bss NOBITS c07ef000 7eefe4 01e628 00 WA 0 0 32\nProgram Headers:\n LOAD 0x008000 0xc0008000 0xc0008000 0x7e6fe4 0x805628 RWE 0x8000\n NOTE 0x7eefc0 0xc07eefc0 0xc07eefc0 0x00024 0x00024 R E 0x4\nSection to Segment mapping:\n Segment Sections...\n 00 \u003c...\u003e .data .notes .bss\n 01 .notes\n\nand to get it exposed as /sys/kernel/notes used by perf tools.\n\nSigned-off-by: Pawel Moll \u003cpawel.moll@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "f60892d3e36dcdd0d9f30db05beae7a446a93f28", "tree": "98e44cc9b390303db2b2405764f4105773178ba6", "parents": [ "e33b9d0878ff6b8a543b3423c3019a5dbbf5689a" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Tue Feb 15 12:44:10 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Feb 21 19:24:13 2011 +0000" }, "message": "ARM: 6673/1: LPAE: use phys_addr_t instead of unsigned long for start of membanks\n\nThe unsigned long datatype is not sufficient for mapping physical addresses\n\u003e\u003d 4GB.\n\nThis patch ensures that the phys_addr_t datatype is used to represent\nthe start address of a membank, which may reside above the 4GB boundary.\n\nAcked-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "315cfe7835c9a3fe27f15519bdeee8bf0a293e33", "tree": "e8656e0752dd6929198e2eb167eaafa5ced191ee", "parents": [ "32c3fcb08178f6ca14191b22d72760984cfb75cb" ], "author": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Tue Feb 15 18:06:57 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Feb 19 11:24:28 2011 +0000" }, "message": "ARM: 6676/1: Correct the cpu_architecture() function for ARMv7\n\nIf ID_MMFR0[3:0] \u003e\u003d 3, the architecture version is ARMv7. The code was\ncurrently only testing for ID_MMFR0[3:0] \u003d\u003d 3.\n\nSigned-off-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "71efb063f4a145ae420be054f5a91dcf7c19b375", "tree": "2fb96d55e39d687d378822b1598dca72c79b720e", "parents": [ "885028e4ba4caf49d565c96481e1a05220ecb517" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Fri Feb 18 16:21:06 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Feb 19 11:24:05 2011 +0000" }, "message": "ARM: 6742/1: pmu: avoid setting IRQ affinity on UP systems\n\nNow that we can execute a CONFIG_SMP kernel on a uniprocessor system,\nextra care has to be taken in the PMU IRQ affinity setting code to\nensure that we don\u0027t always fail to initialise.\n\nThis patch changes the CPU PMU initialisation code so that when we\nonly have a single IRQ, whose affinity can not be changed at the\ncontroller, we report success (0) rather than -EINVAL.\n\nReported-by: Avik Sil \u003cavik.sil@linaro.org\u003e\nAcked-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "0fff6b9a4e0aba233a2ff644316d29b0cb784e33", "tree": "3ba99effedac4a1179fe578e5c0cb81e93bccfbf", "parents": [ "0cc9d5257857608ba85885b75fcada13d359b5d1", "aa90eb9d9d39d6e312b822cfa1512bb76e0e1df3" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Feb 19 09:44:55 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Feb 19 09:44:55 2011 +0000" }, "message": "Merge branch \u0027pmu-for-rmk\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into devel-stable\n" }, { "commit": "4d901c4271951d110afb13ee9aa73d27a6c8e53d", "tree": "3ac2bd52f6029f382399cf15cf35abe568401818", "parents": [ "cada3c0841e1deaec4c0f92654610b028dc683ff" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Wed Feb 02 16:33:17 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Feb 17 23:27:33 2011 +0000" }, "message": "ARM: 6648/1: map ATAGs when not in first 1MB of RAM\n\nIf ATAGs or DTB pointer is not within first 1MB of RAM, then the boot params\nwill not be mapped early enough, so map the 1MB region that r2 points to. Only\nmap the first 1MB when r2 is 0.\n\nSome assembly improvements from Nicolas Pitre.\n\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nAcked-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "cada3c0841e1deaec4c0f92654610b028dc683ff", "tree": "9c6085c8b8447795ddc749315a31fd3906a6159d", "parents": [ "dc21af99fadcfa0ae65b52fd0895f85824f0c288" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jan 04 19:39:29 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Feb 17 23:27:33 2011 +0000" }, "message": "ARM: P2V: extend to 16-bit translation offsets\n\nMSM\u0027s memory is aligned to 2MB, which is more than we can do with our\nexisting method as we\u0027re limited to the upper 8 bits. Extend this by\nusing two instructions to 16 bits, automatically selected when MSM is\nenabled.\n\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nReviewed-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nTested-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "dc21af99fadcfa0ae65b52fd0895f85824f0c288", "tree": "d2d293d79fdb405f25ca7fb18aa16aba6ecea261", "parents": [ "5b7de4547b388d3949620e21d072e35b6f2638fa" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jan 04 19:09:43 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Feb 17 23:27:32 2011 +0000" }, "message": "ARM: P2V: introduce phys_to_virt/virt_to_phys runtime patching\n\nThis idea came from Nicolas, Eric Miao produced an initial version,\nwhich was then rewritten into this.\n\nPatch the physical to virtual translations at runtime. As we modify\nthe code, this makes it incompatible with XIP kernels, but allows us\nto achieve this with minimal loss of performance.\n\nAs many translations are of the form:\n\n\tphysical \u003d virtual + (PHYS_OFFSET - PAGE_OFFSET)\n\tvirtual \u003d physical - (PHYS_OFFSET - PAGE_OFFSET)\n\nwe generate an \u0027add\u0027 instruction for __virt_to_phys(), and a \u0027sub\u0027\ninstruction for __phys_to_virt(). We calculate at run time (PHYS_OFFSET\n- PAGE_OFFSET) by comparing the address prior to MMU initialization with\nwhere it should be once the MMU has been initialized, and place this\nconstant into the above add/sub instructions.\n\nOnce we have (PHYS_OFFSET - PAGE_OFFSET), we can calculate the real\nPHYS_OFFSET as PAGE_OFFSET is a build-time constant, and save this for\nthe C-mode PHYS_OFFSET variable definition to use.\n\nAt present, we are unable to support Realview with Sparsemem enabled\nas this uses a complex mapping function, and MSM as this requires a\nconstant which will not fit in our math instruction.\n\nAdd a module version magic string for this feature to prevent\nincompatible modules being loaded.\n\nTested-by: Tony Lindgren \u003ctony@atomide.com\u003e\nReviewed-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nTested-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "72a20e22f49e2dad3180c23980a9df1c63faab0a", "tree": "97edaa9db248ecc7e9a6a66c1ef5a054412af5c2", "parents": [ "b75c178afaa975896e894bb2b6951dc4cd43c977" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jan 04 19:04:00 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Feb 17 23:27:30 2011 +0000" }, "message": "ARM: P2V: eliminate head.S use of PHYS_OFFSET for !XIP_KERNEL\n\nhead.S makes use of PHYS_OFFSET. When it becomes a variable, the\nassembler won\u0027t understand this. Compute PHYS_OFFSET by the following\nmethod. This code is linked at its virtual address, but run at before\nthe MMU is enabled, so at his physical address.\n\n1:\t.long\t.\n\t.long\tPAGE_OFFSET\n\n\tadr\tr0, 1b\t\t@ r0 \u003d physical \u0027,\u0027\n\tldmia\tr0, {r1, r2}\t@ r1 \u003d virtual \u0027.\u0027, r2 \u003d PAGE_OFFSET\n\tsub\tr1, r0, r1\t@ r1 \u003d physical-virtual\n\tadd\tr2, r2, r1\t@ r2 \u003d PAGE_OFFSET + physical-virtual\n\t\t\t\t@ :\u003d PHYS_OFFSET.\n\nSwitch XIP users of PHYS_OFFSET to use PLAT_PHYS_OFFSET - we can\u0027t\nuse this method for XIP kernels as the code doesn\u0027t execute in RAM.\n\nTested-by: Tony Lindgren \u003ctony@atomide.com\u003e\nReviewed-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "b75c178afaa975896e894bb2b6951dc4cd43c977", "tree": "e3011acbb5c185497e9d72d406b69e5cc20debd5", "parents": [ "f4117ac9e237b74afdf5e001d5ea26a4d15e9847" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jan 04 19:03:16 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Feb 17 23:27:30 2011 +0000" }, "message": "ARM: P2V: avoid initializers and assembly using PHYS_OFFSET\n\nAs PHYS_OFFSET will be becoming a variable, we can\u0027t have it used in\ninitializers nor assembly code. Replace those in generic code with\na run-time initialization. Replace those in platform code using the\nindividual platform specific PLAT_PHYS_OFFSET.\n\nAcked-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nAcked-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nAcked-by: David Brown \u003cdavidb@codeaurora.org\u003e\nAcked-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "f4117ac9e237b74afdf5e001d5ea26a4d15e9847", "tree": "dce3ccceda23d4bf620ec3d025a14773c7c938a8", "parents": [ "6fc31d54443bdc25a8166be15e3920a7e39d195d" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jan 04 18:07:14 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Feb 17 23:26:55 2011 +0000" }, "message": "ARM: P2V: separate PHYS_OFFSET from platform definitions\n\nThis uncouple PHYS_OFFSET from the platform definitions, thereby\nfacilitating run-time computation of the physical memory offset.\n\nAcked-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nAcked-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nAcked-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nAcked-by: Magnus Damm \u003cdamm@opensource.se\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nAcked-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nAcked-by: Wan ZongShun \u003cmcuos.com@gmail.com\u003e\nAcked-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nAcked-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\nAcked-by: Jiandong Zheng \u003cjdzheng@broadcom.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "0e25a5c98067286fc727cf142fc0dadf95790921", "tree": "2561e8b36242fbace98a2fe80047fb32aef6d150", "parents": [ "100b33c8bd8a3235fd0b7948338d6cbb3db3c63d" ], "author": { "name": "Rabin Vincent", "email": "rabin.vincent@stericsson.com", "time": "Tue Feb 08 09:24:36 2011 +0530" }, "committer": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Thu Feb 17 13:55:45 2011 +0100" }, "message": "ARM: perf_event: allow platform-specific interrupt handler\n\nAllow a platform-specific IRQ handler to be specified via platform data.\nThis will be used to implement the single-irq workaround for the DB8500.\n\nSigned-off-by: Rabin Vincent \u003crabin.vincent@stericsson.com\u003e\nAcked-by: Lee Jones \u003clee.jones@linaro.org\u003e\nAcked-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\n" }, { "commit": "6fc31d54443bdc25a8166be15e3920a7e39d195d", "tree": "70ae632dec09e31e7db475de53ee620c2bf1c183", "parents": [ "ebf53826e105f488f4f628703a108e98940d1dc5" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Jan 12 17:50:42 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Feb 15 16:36:44 2011 +0000" }, "message": "ARM: Defer lookup of machine_type to setup.c\n\nSince the debug macros no longer depend on the machine type information,\nthe machine type lookup can be deferred to setup_arch() in setup.c which\nsimplifies the code somewhat.\n\nWe also move the __error_a functionality into setup.c for displaying a\nmessage when a bad machine ID is passed to the kernel via the LL debug\ncode. We also log this into the kernel ring buffer which makes it\npossible to retrieve the message via a debugger.\n\nOriginal idea from Grant Likely.\n\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nTested-by: Tony Lindgren \u003ctony@atomide.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "29a38193c15bd72ba96c57a805443ef46ea6a6ac", "tree": "b4367269a4bfb5b75537605c5191fe4828b62437", "parents": [ "410f14837a92177242a403c20d0a0906fe357019" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Tue Feb 15 14:31:37 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Feb 15 14:20:22 2011 +0000" }, "message": "ARM: 6674/1: LPAE: use long long format when printing physical addresses and ptes\n\nFor the Kernel to support 2 level and 3 level page tables, physical\naddresses (and also page table entries) need to be 32 or 64-bits depending\nupon the configuration.\n\nThis patch uses the %08llx conversion specifier for physical addresses\nand page table entries, ensuring that they are cast to (long long) so\nthat common code can be used regardless of the datatype widths.\n\nAcked-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "753790e713d80b50b867fa1ed32ec0eb5e82ae8e", "tree": "2d4244e4c21ed9512efd48dfd99bfddcbc85af02", "parents": [ "292ec42af7c6361435fe9df50cd59ec76f6741c6" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Feb 06 15:32:24 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Feb 12 11:52:21 2011 +0000" }, "message": "ARM: move cache/processor/fault glue to separate include files\n\nThis allows the cache/processor/fault glue to be more easily used\nfrom assembler code. Tested on Assabet and Tegra 2.\n\nTested-by: Colin Cross \u003cccross@android.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "66e1cfe6d52c69d317e9df76ebc8538a34af0d51", "tree": "18ff75aa8b93be0a994402cd9e447a11e7f8eba8", "parents": [ "ed19b739c5c76ad241d30f6c6a5ee96fb284f4cf" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Fri Feb 11 16:01:42 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Feb 11 22:54:48 2011 +0000" }, "message": "ARM: 6657/1: hw_breakpoint: fix ptrace breakpoint advertising on unsupported arch\n\nThe ptrace debug information register was advertising breakpoint and\nwatchpoint resources for unsupported debug architectures. This meant\nthat setting breakpoints on these architectures would appear to succeed,\nalthough they would never fire in reality.\n\nThis patch fixes the breakpoint slot probing so that it returns 0 when\nrunning on an unsupported debug architecture.\n\nReported-by: Ulrich Weigand \u003culrich.weigand@de.ibm.com\u003e\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "ed19b739c5c76ad241d30f6c6a5ee96fb284f4cf", "tree": "5e36a488dbf997875b732faff8fabfdbe1fac070", "parents": [ "34cd2d38db423a991a36d14e9f79e98993addd07" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Fri Feb 11 15:55:12 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Feb 11 22:54:47 2011 +0000" }, "message": "ARM: 6656/1: hw_breakpoint: avoid UNPREDICTABLE behaviour when reading DBGDSCR\n\nReading baseline CP14 registers, other than DBGDIDR, when the OS Lock\nis set leads to UNPREDICTABLE behaviour.\n\nThis patch ensures that we clear the OS lock before accessing anything\nother than the DBGDIDR, thereby avoiding this behaviour.\n\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "292ec42af7c6361435fe9df50cd59ec76f6741c6", "tree": "376c6bdc9f615988c19f9597020a8cde99005543", "parents": [ "afe8a887550f7cc24eb16449670b93f6b43c32d8" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Feb 04 10:36:39 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Feb 11 12:29:18 2011 +0000" }, "message": "ARM: pm: add function to set WFI low-power mode for SMP CPUs\n\nAdd a function to set the SCU low-power mode for SMP CPUs. This\ncentralizes this functionality rather than having to expose the\nSCU register definitions to each platform.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "cb06199b1df492fcfbaedd2256b5054f944b664f", "tree": "910e7c88876d5e56be4d4f96dc1ab99868ec047c", "parents": [ "4a9cb360197684a861bc06f06d33d5fcc8ffcbf5" ], "author": { "name": "Rabin Vincent", "email": "rabin.vincent@stericsson.com", "time": "Wed Feb 09 11:35:12 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Feb 10 15:29:03 2011 +0000" }, "message": "ARM: 6654/1: perf/oprofile: fix off-by-one in stack check\n\nSince tail is the previous fp - 1, we need to compare the new fp with tail + 1\nto ensure that we don\u0027t end up passing in the same tail again, in order to\navoid a potential infinite loop in the perf interrupt handler (which has been\nobserved to occur). A similar fix seems to be needed in the OProfile code.\n\nAcked-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Rabin Vincent \u003crabin.vincent@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "4a9cb360197684a861bc06f06d33d5fcc8ffcbf5", "tree": "e83a6ecf2fd04ac3535a07a19fc645c1949f0698", "parents": [ "0193c00e85a35ceee7856c89c25b34d5752e0baa" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Feb 10 15:25:18 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Feb 10 15:25:18 2011 +0000" }, "message": "ARM: fixup SMP alternatives in modules\n\nWith certain configurations, we inline the unlock functions in modules,\nwhich results in SMP alternatives being created in modules. We need to\nfix those up when loading a module to prevent undefined instruction\nfaults.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "7db44c75a241c18d03e82540c5b825216d4c668b", "tree": "ed60c9c5b8f894742ff5cfee278e542f5d8818b6", "parents": [ "c786282e6dd18fe2ff43ab44411085dc40e7fbc5" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Jan 17 15:35:37 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Feb 02 21:23:28 2011 +0000" }, "message": "ARM: v6k: select clear exclusive code seqences according to V6 variants\n\nIf CONFIG_CPU_V6 is enabled, then the kernel must support ARMv6 CPUs\nwhich don\u0027t have the V6K extensions implemented. Always use the\ndummy store-exclusive method to ensure that the exclusive monitors are\ncleared.\n\nIf CONFIG_CPU_V6 is not set, but CONFIG_CPU_32v6K is enabled, then we\nhave the K extensions available on all CPUs we\u0027re building support for,\nso we can use the new clear-exclusive instruction.\n\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nTested-by: Sourav Poddar \u003csourav.poddar@ti.com\u003e\nTested-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "e399b1a4e1d205bdc816cb550d2064f2eb1ddc4c", "tree": "cf31e0aeafd972a8ea417dca1ff66c1e0315c907", "parents": [ "000d9c78eb5cd7f18e3d6a381d66e606bc9b8196" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Jan 17 15:08:32 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Feb 02 21:23:26 2011 +0000" }, "message": "ARM: v6k: introduce CPU_V6K option\n\nIntroduce a CPU_V6K configuration option for platforms to select if they\nhave a V6K CPU core. This allows us to identify whether we need to\nsupport ARMv6 CPUs without the V6K SMP extensions at build time.\n\nCurrently CPU_V6K is just an alias for CPU_V6, and all places which\nreference CPU_V6 are replaced by (CPU_V6 || CPU_V6K).\n\nSelect CPU_V6K from platforms which are known to be V6K-only.\n\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nTested-by: Sourav Poddar \u003csourav.poddar@ti.com\u003e\nTested-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "6323f0ccedf756dfe5f46549cec69a2d6d97937b", "tree": "091e3408c12bbce33ef5d708b6131132b9660d4d", "parents": [ "a16ede35a2659170c855c5d267776666c0630f1f" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Jan 16 18:02:17 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Feb 02 21:23:25 2011 +0000" }, "message": "ARM: bitops: switch set/clear/change bitops to use ldrex/strex\n\nSwitch the set/clear/change bitops to use the word-based exclusive\noperations, which are only present in a wider range of ARM architectures\nthan the byte-based exclusive operations.\n\nTested record:\n- Nicolas Pitre: ext3,rw,le\n- Sourav Poddar: nfs,le\n- Will Deacon: ext3,rw,le\n- Tony Lindgren: ext3+nfs,le\n\nReviewed-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nTested-by: Sourav Poddar \u003csourav.poddar@ti.com\u003e\nTested-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nTested-by: Tony Lindgren \u003ctony@atomide.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "e98ff0f55a0232b578c9aa7f1c245868277ac7bc", "tree": "ae50cda9c6d20c260924979a64567399919a463d", "parents": [ "c1928022ef94662a88329e35fa0968b1be328b8e" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Jan 30 16:40:20 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Jan 31 21:48:53 2011 +0000" }, "message": "ARM: smp_on_up: allow non-ARM SMP processors\n\nAllow non-ARM SMP processors to use the SMP_ON_UP feature. CPUs\nsupporting SMP must have the new CPU ID format, so check for this first.\nThen check for ARM11MPCore, which fails the MPIDR check. Lastly check\nthe MPIDR reports multiprocessing extensions and that the CPU is part of\na multiprocessing system.\n\nCc: \u003cstable@kernel.org\u003e\nReported-and-Tested-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nAcked-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "6906e33cc555c390cd091f6f363b783322dfedf6", "tree": "30c46d66fc37bc08a766c15912f9d9a25ff83b59", "parents": [ "1340f3e0b29b745a33f431455c3a37f48197bc81" ], "author": { "name": "Torben Hohn", "email": "torbenh@gmx.de", "time": "Thu Jan 27 15:59:21 2011 +0100" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon Jan 31 14:55:43 2011 +0100" }, "message": "arm: Switch from do_timer() to xtime_update()\n\nxtime_update takes the xtime_lock itself.\n\nSigned-off-by: Torben Hohn \u003ctorbenh@gmx.de\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: johnstul@us.ibm.com\nCc: hch@infradead.org\nCc: yong.zhang0@gmail.com\nLKML-Reference: \u003c20110127145920.23248.75541.stgit@localhost\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "03399c1cb4e2503e92d10c1ce38ac2e69b7d2380", "tree": "a7a9b7910fb212bf7c57f6330b4a208ea8b17143", "parents": [ "baaece224570a935210a59257b5d9073e99843ea" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jan 25 10:35:36 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jan 25 21:17:58 2011 +0000" }, "message": "ARM: twd: ensure timer reload is reprogrammed on entry to periodic mode\n\nEnsure that the twd timer reload value is reprogrammed each time we\nenter periodic mode. This ensures that the reload value is always\nreset correctly.\n\nTested-by: Santosh Shilimkar \u003csantosh.shilimkar@ti.com\u003e\nAcked-by: Colin Cross \u003cccross@android.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "19df0c2fef010e94e90df514aaf4e73f6b80145c", "tree": "4b0b9c10622aead0d8b658cca6c49090149a91a8", "parents": [ "c723fdab8aa728dc2bf0da6a0de8bb9c3f588d84" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Jan 25 14:26:50 2011 +0100" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Jan 25 14:26:50 2011 +0100" }, "message": "percpu: align percpu readmostly subsection to cacheline\n\nCurrently percpu readmostly subsection may share cachelines with other\npercpu subsections which may result in unnecessary cacheline bounce\nand performance degradation.\n\nThis patch adds @cacheline parameter to PERCPU() and PERCPU_VADDR()\nlinker macros, makes each arch linker scripts specify its cacheline\nsize and use it to align percpu subsections.\n\nThis is based on Shaohua\u0027s x86 only patch.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Shaohua Li \u003cshaohua.li@intel.com\u003e\n" }, { "commit": "16c1020362083b320868c0deef492249089c3cd3", "tree": "ff200df3502e6010745713275d69fd0a07e399cf", "parents": [ "65e5d002b5ad220db2bf9557f53de5a98f7dab86", "bbba75606963c82febf7bd2761ea848ac5d1a1bb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 15 12:33:40 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 15 12:33:40 2011 -0800" }, "message": "Merge branch \u0027devel-stable\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027devel-stable\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm: (161 commits)\n ARM: pxa: fix building issue of missing physmap.h\n ARM: mmp: PXA910 drive strength FAST using wrong value\n ARM: mmp: MMP2 drive strength FAST using wrong value\n ARM: pxa: fix recursive calls in pxa_low_gpio_chip\n AT91: Support for gsia18s board\n AT91: Acme Systems FOX Board G20 board files\n AT91: board-sam9m10g45ek.c: Remove duplicate inclusion of mach/hardware.h\n ARM: pxa: fix suspend/resume array index miscalculation\n ARM: pxa: use cpu_has_ipr() consistently in irq.c\n ARM: pxa: remove unused variable in clock-pxa3xx.c\n ARM: pxa: fix warning in zeus.c\n ARM: sa1111: fix typo in sa1111_retrigger_lowirq()\n ARM mxs: clkdev related compile fixes\n ARM i.MX mx31_3ds: Fix MC13783 regulator names\n ARM: plat-stmp3xxx: irq_data conversion.\n ARM: plat-spear: irq_data conversion.\n ARM: plat-orion: irq_data conversion.\n ARM: plat-omap: irq_data conversion.\n ARM: plat-nomadik: irq_data conversion.\n ARM: plat-mxc: irq_data conversion.\n ...\n\nFix up trivial conflict in arch/arm/plat-omap/gpio.c (Lennert\nBuytenhek\u0027s irq_data conversion clashing with some omap irq updates)\n" }, { "commit": "65e5d002b5ad220db2bf9557f53de5a98f7dab86", "tree": "93d36afd4b82a24e5b553766a574a6632fca3aff", "parents": [ "38567333a6dabd0f2b4150e9fb6dd8e3ba2985e5", "cb4d3eaebb96616085f5a46a7d7e004ddd955b09" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 15 12:29:50 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 15 12:29:50 2011 -0800" }, "message": "Merge branch \u0027fixes\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027fixes\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm:\n ARM: fix missing branch in __error_a\n ARM: fix /proc/$PID/stack on SMP\n ARM: Fix build regression on SA11x0, PXA, and H720x targets\n ARM: 6625/1: use memblock memory regions for \"System RAM\" I/O resources\n ARM: fix wrongly patched constants\n ARM: 6624/1: fix dependency for CONFIG_SMP_ON_UP\n ARM: 6623/1: Thumb-2: Fix out-of-range offset for Thumb-2 in proc-v7.S\n ARM: 6622/1: fix dma_unmap_sg() documentation\n ARM: 6621/1: bitops: remove condition code clobber for CLZ\n ARM: 6620/1: Change misleading warning when CONFIG_CMDLINE_FORCE is used\n ARM: 6619/1: nommu: avoid mapping vectors page when !CONFIG_MMU\n ARM: sched_clock: make minsec argument to clocks_calc_mult_shift() zero\n ARM: sched_clock: allow init_sched_clock() to be called early\n ARM: integrator: fix compile warning in cpu.c\n ARM: 6616/1: Fix ep93xx-fb init/exit annotations\n ARM: twd: fix display of twd frequency\n ARM: udelay: prevent math rounding resulting in short udelays\n" }, { "commit": "cb4d3eaebb96616085f5a46a7d7e004ddd955b09", "tree": "68d53e993cdc1810762f0ff91c8891dc4090f86e", "parents": [ "d5996b2ff0e26cf7ed4c103084a2d6fc569e7216" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Jan 15 11:19:19 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Jan 15 11:19:19 2011 +0000" }, "message": "ARM: fix missing branch in __error_a\n\nWhen DEBUG_LL is not set, we don\u0027t want __error_a re-entering\n__lookup_machine_type - we want it to go to the error function. This\nused to be the case before we reorganized the layout for hotplug cpu,\nas we used to fall through to __error. With the changed layout, we\nneed an explicit branch here instead.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "d5996b2ff0e26cf7ed4c103084a2d6fc569e7216", "tree": "c4d50df299e9c0e07e8ae66406489c01f4c9d6a9", "parents": [ "671289c2872cfc050954ac1dd3131429fca30aad" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Jan 15 09:27:04 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Jan 15 09:27:04 2011 +0000" }, "message": "ARM: fix /proc/$PID/stack on SMP\n\nRabin Vincent reports:\n| On SMP, this BUG() in save_stack_trace_tsk() can be easily triggered\n| from user space by reading /proc/$PID/stack, where $PID is any pid but\n| the current process:\n|\n|\tif (tsk !\u003d current) {\n| #ifdef CONFIG_SMP\n|\t\t/*\n|\t\t * What guarantees do we have here that \u0027tsk\u0027\n|\t\t * is not running on another CPU?\n|\t\t */\n|\t\tBUG();\n| #else\n\nFix this by replacing the BUG() with an entry to terminate the stack\ntrace, returning an empty trace - I\u0027d rather not expose the dwarf\nunwinder to a volatile stack of a running thread.\n\nReported-by: Rabin Vincent \u003crabin@rab.in\u003e\nTested-by: Rabin Vincent \u003crabin@rab.in\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "11b9369cbb0a13cabb581aec3e6812a171cf2fd7", "tree": "92f47c2f30eb4910b2720165476e5112a8359b32", "parents": [ "30b99d07b7e08d0e6bcc2f0b924828c03e67f881" ], "author": { "name": "Dima Zavin", "email": "dima@android.com", "time": "Fri Jan 14 23:05:14 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Jan 14 22:14:04 2011 +0000" }, "message": "ARM: 6625/1: use memblock memory regions for \"System RAM\" I/O resources\n\nDo not use memory bank info to request the \"system ram\" resources as\nthey do not track holes created by memblock_remove inside\nmachine\u0027s reserve callback. If the removed memory is passed as\nplatform_device\u0027s ioresource, then drivers that call\nrequest_mem_region would fail due to a conflict with the incorrectly\nconfigured system ram resource.\n\nInstead, iterate through the regions of memblock.memory and add\nthose as \"System RAM\" resources.\n\nSigned-off-by: Dima Zavin \u003cdima@android.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "d0a21265dfb5fa8ae54e90d0fb6d1c215b10a28a", "tree": "a3bf2c96ad8e180f32a52e208667a40bb972275b", "parents": [ "ec3f64fc9c196a304c4b7db3e1ff56d640628509" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Thu Jan 13 15:46:02 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 17:32:34 2011 -0800" }, "message": "mm: unify module_alloc code for vmalloc\n\nFour architectures (arm, mips, sparc, x86) use __vmalloc_area() for\nmodule_init(). Much of the code is duplicated and can be generalized in a\nglobally accessible function, __vmalloc_node_range().\n\n__vmalloc_node() now calls into __vmalloc_node_range() with a range of\n[VMALLOC_START, VMALLOC_END) for functionally equivalent behavior.\n\nEach architecture may then use __vmalloc_node_range() directly to remove\nthe duplication of code.\n\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nCc: Christoph Lameter \u003ccl@linux.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4a87bac4c9b3291ade91fe4fc1382f22dd9e9e91", "tree": "c0fa9d67f09a26df6823825d4157d60a8e48e5b3", "parents": [ "f64305a68b3cc688a20970cd6317f96c5778ea6f" ], "author": { "name": "Lennert Buytenhek", "email": "buytenh@wantstofly.org", "time": "Mon Nov 29 10:21:01 2010 +0100" }, "committer": { "name": "Lennert Buytenhek", "email": "buytenh@wantstofly.org", "time": "Thu Jan 13 12:26:17 2011 +0100" }, "message": "ARM: ecard: irq_data conversion.\n\nSigned-off-by: Lennert Buytenhek \u003cbuytenh@secretlab.ca\u003e\nAcked-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "f64305a68b3cc688a20970cd6317f96c5778ea6f", "tree": "5f6be13ee877f1789ae15afa8a14e1178209bcae", "parents": [ "e2a93ecc7fc469dab52323c11a2d8ceaa62aac7b" ], "author": { "name": "Lennert Buytenhek", "email": "buytenh@wantstofly.org", "time": "Mon Nov 29 10:21:48 2010 +0100" }, "committer": { "name": "Lennert Buytenhek", "email": "buytenh@wantstofly.org", "time": "Thu Jan 13 12:26:17 2011 +0100" }, "message": "ARM: core irq_data conversion.\n\nSigned-off-by: Lennert Buytenhek \u003cbuytenh@secretlab.ca\u003e\n" }, { "commit": "22eeb8f6e0214a83ac6958a29a83572137f174bb", "tree": "60a8dc6d8550376efdeedb6ed9cec9cd5092d9a3", "parents": [ "6cde6d4217ff01422c093d3f7ff550b7a324e96e" ], "author": { "name": "Alexander Holler", "email": "holler@ahsoftware.de", "time": "Wed Jan 12 14:08:37 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Jan 12 14:22:25 2011 +0000" }, "message": "ARM: 6620/1: Change misleading warning when CONFIG_CMDLINE_FORCE is used\n\nWhen CONFIG_CMDLINE_FORCE is used, the warning\n\n Ignoring unrecognised tag 0x54410009\n\nwas displayed. Change this to\n\n Ignoring tag cmdline (using the default kernel command line)\n\nSigned-off-by: Alexander Holler \u003choller@ahsoftware.de\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "6cde6d4217ff01422c093d3f7ff550b7a324e96e", "tree": "2542d21d333bbbb1dd1deed655acabc834465c0f", "parents": [ "edc4d272551594729f63ca4cde1612608494091f" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Tue Jan 11 14:04:36 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jan 11 17:32:24 2011 +0000" }, "message": "ARM: 6619/1: nommu: avoid mapping vectors page when !CONFIG_MMU\n\nWhen running without an MMU, we do not need to install a mapping for the\nvectors page. Attempting to do so causes a compile-time error because\ninstall_special_mapping is not defined.\n\nThis patch adds compile-time guards to the vector mapping functions\nso that we can build nommu configurations once more.\n\nAcked-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "edc4d272551594729f63ca4cde1612608494091f", "tree": "e823892f052e72e1fa6ee07eae986993965cc3e8", "parents": [ "211baa7016894c02fc18693e21ca479cd08ac0c0" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jan 11 16:44:02 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jan 11 16:44:02 2011 +0000" }, "message": "ARM: sched_clock: make minsec argument to clocks_calc_mult_shift() zero\n\nThe purpose of the minsec argument is to prevent 64-bit math overflow\nwhen the number of cycles is multiplied up. However, the multipler\nis 32-bit, and in the sched_clock() case, the cycle counter is up to\n32-bit as well. So the math can never overflow.\n\nWith a value of 60, and clock rates greater than 71MHz, the calculated\nmultiplier is unnecessarily reduced in value, which reduces accuracy by\nmaybe 70ppt. It\u0027s almost not worth bothering with as the oscillator\ndriving the counter won\u0027t be any more than 1ppm - unless you\u0027re using\na rubidium lamp or caesium fountain frequency standard.\n\nSo, set the minsec argument to zero.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "211baa7016894c02fc18693e21ca479cd08ac0c0", "tree": "0fea398c6288b46542fc1640adff697f9b1e07a5", "parents": [ "1aa023b8fda8096caf41c20427a0ef396d88eb0f" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jan 11 16:23:04 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jan 11 16:23:04 2011 +0000" }, "message": "ARM: sched_clock: allow init_sched_clock() to be called early\n\nsched_clock is supposed to be initialized early - in the recently added\ninit_early platform hook. However, in doing so we end up calling\nmod_timer() before the timer lists are initialized, resulting in an\noops.\n\nSplit the initialization in two - the part which the platform calls\nearly which starts things off. The addition of the timer can be\ndelayed until after we have more of the kernel initialized - when the\nnormal time sources are initialized.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "6426d2c2f071e0be50a22052a47b582f2561e5e0", "tree": "8591717e1f4fb24e6236db78fb9aa029adfd1be4", "parents": [ "56949d414acd30353fdba4b64876a0a7953a7b77" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jan 11 12:11:01 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jan 11 12:11:01 2011 +0000" }, "message": "ARM: twd: fix display of twd frequency\n\nThe fraction of MHz was not being displayed correctly as the calculation\nwas a factor of 10 out. Fix this.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "3c0cb7c31c206aaedb967e44b98442bbeb17a6c4", "tree": "3ecba45d7ffae4fba4a5aafaef4af5b0b1105bde", "parents": [ "f70f5b9dc74ca7d0a64c4ead3fb28da09dc1b234", "404a02cbd2ae8bf256a2fa1169bdfe86bb5ebb34" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 06 16:50:35 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 06 16:50:35 2011 -0800" }, "message": "Merge branch \u0027devel\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027devel\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm: (416 commits)\n ARM: DMA: add support for DMA debugging\n ARM: PL011: add DMA burst threshold support for ST variants\n ARM: PL011: Add support for transmit DMA\n ARM: PL011: Ensure IRQs are disabled in UART interrupt handler\n ARM: PL011: Separate hardware FIFO size from TTY FIFO size\n ARM: PL011: Allow better handling of vendor data\n ARM: PL011: Ensure error flags are clear at startup\n ARM: PL011: include revision number in boot-time port printk\n ARM: vexpress: add sched_clock() for Versatile Express\n ARM i.MX53: Make MX53 EVK bootable\n ARM i.MX53: Some bug fix about MX53 MSL code\n ARM: 6607/1: sa1100: Update platform device registration\n ARM: 6606/1: sa1100: Fix platform device registration\n ARM i.MX51: rename IPU irqs\n ARM i.MX51: Add ipu clock support\n ARM: imx/mx27_3ds: Add PMIC support\n ARM: DMA: Replace page_to_dma()/dma_to_page() with pfn_to_dma()/dma_to_pfn()\n mx51: fix usb clock support\n MX51: Add support for usb host 2\n arch/arm/plat-mxc/ehci.c: fix errors/typos\n ...\n" }, { "commit": "404a02cbd2ae8bf256a2fa1169bdfe86bb5ebb34", "tree": "99119edc53fdca73ed7586829b8ee736e09440b3", "parents": [ "28cdac6690cb113856293bf79b40de33dbd8f974", "1051b9f0f9eab8091fe3bf98320741adf36b4cfa" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 06 22:33:32 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 06 22:33:32 2011 +0000" }, "message": "Merge branch \u0027devel-stable\u0027 into devel\n\nConflicts:\n\tarch/arm/mach-pxa/clock.c\n\tarch/arm/mach-pxa/clock.h\n" }, { "commit": "28cdac6690cb113856293bf79b40de33dbd8f974", "tree": "64cd8ca8376ccf9a12faee3588c15a5839f9a28b", "parents": [ "4073723acb9cdcdbe4df9c0e0c376c65d1697e43", "36bb94ba36f332de767cfaa3af6a5136435a3a9c" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 06 22:33:19 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 06 22:33:19 2011 +0000" }, "message": "Merge branch \u0027pgt\u0027 (early part) into devel\n" }, { "commit": "4073723acb9cdcdbe4df9c0e0c376c65d1697e43", "tree": "f41c17eac157b1223ce104845cf9b1e5a9e6a83d", "parents": [ "58daf18cdcab550262a5f4681e1f1e073e21965a", "4ec3eb13634529c0bc7466658d84d0bbe3244aea" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 06 22:32:52 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 06 22:32:52 2011 +0000" }, "message": "Merge branch \u0027misc\u0027 into devel\n\nConflicts:\n\tarch/arm/Kconfig\n\tarch/arm/common/Makefile\n\tarch/arm/kernel/Makefile\n\tarch/arm/kernel/smp.c\n" }, { "commit": "4ec3eb13634529c0bc7466658d84d0bbe3244aea", "tree": "b491daac2ccfc7b8ca88e171a43f66888463568a", "parents": [ "24056f525051a9e186af28904b396320e18bf9a0", "15095bb0fe779c0403091bda7adce5fb3bb9ca35" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 06 22:31:35 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 06 22:32:03 2011 +0000" }, "message": "Merge branch \u0027smp\u0027 into misc\n\nConflicts:\n\tarch/arm/kernel/entry-armv.S\n\tarch/arm/mm/ioremap.c\n" }, { "commit": "58daf18cdcab550262a5f4681e1f1e073e21965a", "tree": "2096324b947761a567dd451f33664f17ee1de2cd", "parents": [ "aa312be1987d43216e72ffce42bccf6bf81f62ed", "0af85dda39d9b673aca8c0ebae004ea70f3efc93" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Jan 05 18:09:03 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Jan 05 18:09:03 2011 +0000" }, "message": "Merge branch \u0027clksrc\u0027 into devel\n\nConflicts:\n\tarch/arm/mach-vexpress/v2m.c\n\tarch/arm/plat-omap/counter_32k.c\n\tarch/arm/plat-versatile/Makefile\n" }, { "commit": "31edf274f9aff1ccd39934a0b2fce38f4405c656", "tree": "fdc7bc445307ccb9648ca1a71375947c8ed59722", "parents": [ "3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5", "ed60453fa8f8fc3d034dfdf10371a99cc6905626", "ac61d143ffe2a6db4d4bcf47c21a5159d6a1b644", "28257f7fdee0facc3b7f934e82c2485f27120d41", "b23065313297e750edd57ab6edfd36224826724e", "50005a8deb38e5e6456ebd94e57adb321d4589de", "cf562b4a550b3cd9d602a05bc27aaaaa376947b4", "3d09fbcd26851ffb2c40cec411b8e56db02520d1", "8a9618f5dfca35edb0d7ab6374ff586e2e9e989b" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Jan 05 18:08:10 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Jan 05 18:08:10 2011 +0000" }, "message": "Merge branches \u0027ftrace\u0027, \u0027gic\u0027, \u0027io\u0027, \u0027kexec\u0027, \u0027mod\u0027, \u0027sa11x0\u0027, \u0027sh\u0027 and \u0027versatile\u0027 into devel\n" }, { "commit": "aef1b9cef78ae65c6501850851cc3f61f9be477b", "tree": "9769972983e84620df17c13b73f70a8341c4b125", "parents": [ "20c457b8587bee4644d998331d9e13be82e05b4c", "3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jan 05 14:22:08 2011 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jan 05 14:22:10 2011 +0100" }, "message": "Merge commit \u0027v2.6.37\u0027 into perf/core\n\nMerge reason: Add the final .37 tree.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "dec12e62c03d26bbc7a142f067215a3a43cce7d0", "tree": "e83d19c45b487ad17ceb43c743aad2ed5701be8d", "parents": [ "8ff1443c5439ecee7472b80cf12ecfc337e6ee98" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Dec 16 13:49:34 2010 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Dec 24 09:49:52 2010 +0000" }, "message": "ARM: provide an early platform initialization hook\n\nThis allows platforms to hook into the initialization early to setup\nthings like scheduler clocks, etc.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "8ff1443c5439ecee7472b80cf12ecfc337e6ee98", "tree": "b6899444bc0b66a016d29271c5d70e8ad43db5ca", "parents": [ "cd544ce754ac2432ffcc0626ea802d2b30876b50" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Dec 20 10:18:36 2010 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Dec 24 09:49:51 2010 +0000" }, "message": "ARM: simplify early machine init hooks\n\nRather than storing each machine init hook separately, store a\npointer to the machine description record and dereference this\ninstead. This pointer is only available while the init sections\nare present, which is not a problem as we only use it from init\ncode.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" } ], "next": "cd544ce754ac2432ffcc0626ea802d2b30876b50" }