aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* enable nfs supportDaniel Hillenbrand2013-06-018-14/+110
| | | | Change-Id: I84dc53e949be90ca464cb80432105130d089dd90
* 4412: builtin md4 and dnsresolverDaniel Hillenbrand2013-06-017-10/+10
| | | | Change-Id: Iab4e05f831e09d6cb2b40a2117accdb5b903a6b2
* i777, i9100, n7000: enable utf8 support for nlsDaniel Hillenbrand2013-06-013-3/+3
| | | | Change-Id: Iefbeee4aa149eaf9a5aca1651cc39a592f0e4208
* mali: change alloc order from 6 to 11 for 4210Daniel Hillenbrand2013-05-301-4/+0
| | | | | | taken from samsung i9100 jb update Change-Id: Ie67ffa8a72101fbe4460cdde1cb5c3435979ca66
* usb gadget: use two luns on devices with two cardsDaniel Hillenbrand2013-05-291-11/+24
| | | | | | | - ported from Codeworkx's smdk4210 patch (https://github.com/CyanogenMod/android_kernel_samsung_smdk4210/commit/7f87bd61861a7c6dfc74c6f113f4df655b8925ff) - allows to use both internal and external sd-card as mass-storage on devices with two cards Change-Id: I3345097081bc1e306b8a63c0ae2b0edcccbff018
* ondemand: cpuidle detectionAndrea Arcangeli2013-05-281-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I found a problem with the ondemand governor while in earlysuspend suspend mode (ondemand keeping the freq close to the max at all times despite near 0% load). The problem is that the cpu starts to go in long cpuidle cycles, a sampling_rate of 10000 (usec) is applied only once in a while and the real sampling_rate becomes 1 second (or more). So when a wakeup happens we return to the 10000usec sampling rate. The ondemand sees lots of activity after the wakeup but those "loads" must be adjusted down if the previous wall_time delta was huge and the current one is tiny. We're too close to long cpuidle to worry about the cpu freq anyway and it may be just a jitter load that if we take into account without adjusting it down, will lead to the next long cpuidle to be entered at the max freq again, and this repeats forever. So my solution is to tweak the ondemand to scale down the "load" according to the decrease in the wall_time delta ratio (deep_sleep_ratio variable). This allows the CPU to stay at the lowest freq during the deep sleeps even when the ondemand governor is enabled and the sampling_rate is set to 10000. (setting the sampling_rate to values >100000 would also tend to hide the problem but it'd screw the interactive behavior by running at the lowest frequency for too long during interactive usage) During interactive usage with the screen on (not in earlysuspend mode), or during playback or voip with screen off the deep_sleep_rate is set to 1 practically all the time so it won't alter the behavior of the ondemand governor unless the system is very idle (and in turn when we want it to stay at low freq). Change-Id: If0391e6d6c41c1c8c9fa590502e88e681a800b04 Signed-off-by: Andrea Arcangeli <andrea@cpushare.com>
* Merge "drivers: modem_if : Remove some debugging" into cm-10.1Daniel Hillenbrand2013-05-274-10/+10
|\
| * drivers: modem_if : Remove some debuggingsakindia1232013-05-274-10/+10
| | | | | | | | Change-Id: I4ac65badbd41c930bc226d0162cdb446f32d6fe6
* | mach-u1: Improve touch sensitivity for MXT224E controllersakindia1232013-05-261-2/+2
|/ | | | | | | This reduces the janky scrolling observed Picked from : https://github.com/kgp700/exyroid-sgs2-jb/commit/2476a919c24f07e04f50a80442fc65d27af51ff5 Change-Id: I07c166f6f07b2874fa20be6f41bc5a016d93e653
* mxt224_u1: Silence some status messagessakindia1232013-05-261-3/+3
| | | | Change-Id: Ied425b0a0c8cd83ba96fdbdfa15a979af59f7cae
* makefile: mach-exynos: Separate 4x10 and 4x12 objectssakindia1232013-05-261-2/+8
| | | | Change-Id: If3270ba8e454d224d18202ff5e751fc61792b4d7
* cm3663: fix initial proximity sensor stateDaniel Hillenbrand2013-05-261-0/+4
| | | | Change-Id: I544cf4065fd18bd9a54c855fdbbe3507c3ec3f75
* u1: add cyanogenmod mdnie scenarioDaniel Hillenbrand2013-05-252-0/+61
| | | | Change-Id: Ieed885c3c06c8c0445d6e6f2bd68de2bc0223491
* i777, i9100, n7000: regenerate defconfigsDaniel Hillenbrand2013-05-253-66/+42
| | | | Change-Id: Ibf954e20e70c9e6dac75b8e1da02bf5a1152098c
* u1: import from CyanogenMod/android_kernel_samsung_smdk4210Daniel Hillenbrand2013-05-2540-424/+15600
| | | | Change-Id: I9629a4060538c9c4c6a43a86a56826cd7123d1b5
* migrate: fix merge failDaniel Hillenbrand2013-05-251-6/+2
| | | | Change-Id: Ic7caec90cd2c7bb977040d4e416016ca36ee4eea
* Correct md5sum executable on OSX hostsJavier Ferrer2013-05-032-2/+19
| | | | | | On OSX hosts the md5sum executable is called md5 instead. Change-Id: I0b8e3ab137136be6e45fd4b9f77f2c036e8b981a
* update bcmdhd driver from GT-9505 Sourcesbrissen2013-04-2579-3753/+9568
| | | | | | drivers pulled from http://review.cyanogenmod.org/#/c/36122/ Change-Id: Ide4aef99ee1d594f4222ae69aca0bdb7d563e80a
* t0ltecdma: enable support for car docksbrissen2013-04-151-1/+1
| | | | Change-Id: I7f0e89e533f7d639d88da16bd56ccc931eb36ad7
* t0lte: enable support for car dockDaniel Hillenbrand2013-04-131-1/+1
| | | | Change-Id: I3a8ffe754b222d553975ca0ea85489f8f71bdbbd
* i9305: Enable car dockmark2013-04-061-3/+3
| | | | Change-Id: I210846d796a04daf844924129626f4b9ca0ed1ec
* i9300: reenable dock supportDaniel Hillenbrand2013-04-031-3/+3
| | | | Change-Id: Ifed3eefcbc081b3cdde4082ec86c8a39a2a3071a
* smdk4412: enable sio ioschedDaniel Hillenbrand2013-04-027-7/+7
| | | | Change-Id: Ic5d7355620b6762b6a6b0e39d8fb895c119d1dce
* block: add sio ioschedDaniel Hillenbrand2013-04-0210-0/+425
| | | | Change-Id: Iaa76975d4635d2f5c560d39fbf23919410e7e64f
* smdk4412: enable row ioschedDaniel Hillenbrand2013-04-027-0/+7
| | | | Change-Id: I67f753a0702f224c6202247d0fd500c719326a96
* block: add row ioschedDaniel Hillenbrand2013-04-024-0/+826
| | | | Change-Id: I01857784f0506a0b443dd01c801908e0beea5f66
* smdk4412: mali: merge with r3p1 driver from note8Justin2013-03-2658-951/+1762
| | | | Change-Id: I75db69081b986ec326fe347f73aa3655648e6b81
* Merge branch 'cm-10.1-experimental' into HEADcodeworkx2013-03-161025-7154/+15752
|\
| * WIFI: Use kernel version 3.4 ifdef's.Brian Beloshapka2013-02-271-13/+26
| | | | | | | | Change-Id: I7f8414839e2205dff8939cab6739789633e31204
| * wireless backport from 3.4Andrew Dodd2013-02-2722-1005/+2996
| | | | | | | | | | | | Courtesy of Brian Beloshapka (bbelos) Change-Id: I4b0a8d591bfe57c9f69943ecaf2fa80e772fde8e
| * config: Regenerate for new bcmdhd driverAndrew Dodd2013-02-271-5/+9
| | | | | | | | Change-Id: Ic290661cf04c03a10e444d0ee8b1b6c713470e78
| * bcmdhd: kang from d2Andrew Dodd2013-02-2735-731/+1518
| | | | | | | | Change-Id: I16a99ec34895212fecbafa13fdb714158b476dad
| * mm: Update Samsung's -cma shit to match 3.0.64Andrew Dodd2013-02-273-88/+152
| | | | | | | | | | | | | | | | Samsung forked compaction and page_alloc to compaction-cma and page_alloc-cma - fix stuff that breaks. We may need to update more later. Change-Id: I8325611e4e41af22688553a835dbc490c70793e1
| * Fix mistakes in mergeAndrew Dodd2013-02-272-1/+1
| | | | | | | | Change-Id: Ib92c3067dec28605e8905daddc44a667683bebc7
| * Merge remote-tracking branch 'kernelorg/linux-3.0.y' into 3_0_64Andrew Dodd2013-02-27969-5315/+11054
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/Kconfig arch/arm/include/asm/hwcap.h arch/arm/kernel/smp.c arch/arm/plat-samsung/adc.c drivers/gpu/drm/i915/i915_reg.h drivers/gpu/drm/i915/intel_drv.h drivers/mmc/core/sd.c drivers/net/tun.c drivers/net/usb/usbnet.c drivers/regulator/max8997.c drivers/usb/core/hub.c drivers/usb/host/xhci.h drivers/usb/serial/qcserial.c fs/jbd2/transaction.c include/linux/migrate.h kernel/sys.c kernel/time/timekeeping.c lib/genalloc.c mm/memory-failure.c mm/memory_hotplug.c mm/mempolicy.c mm/page_alloc.c mm/vmalloc.c mm/vmscan.c mm/vmstat.c scripts/Kbuild.include Change-Id: I91e2d85c07320c7ccfc04cf98a448e89bed6ade6
| | * Linux 3.0.64Greg Kroah-Hartman2013-02-141-1/+1
| | |
| | * netback: correct netbk_tx_err to handle wrap around.Ian Campbell2013-02-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | [ Upstream commit b9149729ebdcfce63f853aa54a404c6a8f6ebbf3 ] Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Jan Beulich <JBeulich@suse.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| | * xen/netback: free already allocated memory on failure in xen_netbk_get_requestsIan Campbell2013-02-141-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | [ Upstream commit 4cc7c1cb7b11b6f3515bd9075527576a1eecc4aa ] Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| | * xen/netback: don't leak pages on failure in xen_netbk_tx_check_gop.Matthew Daley2013-02-141-26/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ Upstream commit 7d5145d8eb2b9791533ffe4dc003b129b9696c48 ] Signed-off-by: Matthew Daley <mattjd@gmail.com> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Acked-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Jan Beulich <JBeulich@suse.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| | * xen/netback: shutdown the ring if it contains garbage.Ian Campbell2013-02-143-26/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ Upstream commit 48856286b64e4b66ec62b94e504d0b29c1ade664 ] A buggy or malicious frontend should not be able to confuse netback. If we spot anything which is not as it should be then shutdown the device and don't try to continue with the ring in a potentially hostile state. Well behaved and non-hostile frontends will not be penalised. As well as making the existing checks for such errors fatal also add a new check that ensures that there isn't an insane number of requests on the ring (i.e. more than would fit in the ring). If the ring contains garbage then previously is was possible to loop over this insane number, getting an error each time and therefore not generating any more pending requests and therefore not exiting the loop in xen_netbk_tx_build_gops for an externded period. Also turn various netdev_dbg calls which no precipitate a fatal error into netdev_err, they are rate limited because the device is shutdown afterwards. This fixes at least one known DoS/softlockup of the backend domain. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Acked-by: Jan Beulich <JBeulich@suse.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| | * tg3: Fix crc errors on jumbo frame receiveNithin Nayak Sujir2013-02-141-21/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ Upstream commit daf3ec688e057f6060fb9bb0819feac7a8bbf45c ] TG3_PHY_AUXCTL_SMDSP_ENABLE/DISABLE macros do a blind write to the phy auxiliary control register and overwrite the EXT_PKT_LEN (bit 14) resulting in intermittent crc errors on jumbo frames with some link partners. Change the code to do a read/modify/write. Signed-off-by: Nithin Nayak Sujir <nsujir@broadcom.com> Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| | * tg3: Avoid null pointer dereference in tg3_interrupt in netconsole modeNithin Nayak Sujir2013-02-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ Upstream commit 9c13cb8bb477a83b9a3c9e5a5478a4e21294a760 ] When netconsole is enabled, logging messages generated during tg3_open can result in a null pointer dereference for the uninitialized tg3 status block. Use the irq_sync flag to disable polling in the early stages. irq_sync is cleared when the driver is enabling interrupts after all initialization is completed. Signed-off-by: Nithin Nayak Sujir <nsujir@broadcom.com> Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| | * bridge: Pull ip header into skb->data before looking into ip header.Sarveshwar Bandi2013-02-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ Upstream commit 6caab7b0544e83e6c160b5e80f5a4a7dd69545c7 ] If lower layer driver leaves the ip header in the skb fragment, it needs to be first pulled into skb->data before inspecting ip header length or ip version number. Signed-off-by: Sarveshwar Bandi <sarveshwar.bandi@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| | * tcp: fix MSG_SENDPAGE_NOTLAST logicEric Dumazet2013-02-141-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ Upstream commit ae62ca7b03217be5e74759dc6d7698c95df498b3 ] commit 35f9c09fe9c72e (tcp: tcp_sendpages() should call tcp_push() once) added an internal flag : MSG_SENDPAGE_NOTLAST meant to be set on all frags but the last one for a splice() call. The condition used to set the flag in pipe_to_sendpage() relied on splice() user passing the exact number of bytes present in the pipe, or a smaller one. But some programs pass an arbitrary high value, and the test fails. The effect of this bug is a lack of tcp_push() at the end of a splice(pipe -> socket) call, and possibly very slow or erratic TCP sessions. We should both test sd->total_len and fact that another fragment is in the pipe (pipe->nrbufs > 1) Many thanks to Willy for providing very clear bug report, bisection and test programs. Reported-by: Willy Tarreau <w@1wt.eu> Bisected-by: Willy Tarreau <w@1wt.eu> Tested-by: Willy Tarreau <w@1wt.eu> Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| | * tcp: fix for zero packets_in_flight was too broadIlpo Järvinen2013-02-141-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ Upstream commit 6731d2095bd4aef18027c72ef845ab1087c3ba63 ] There are transients during normal FRTO procedure during which the packets_in_flight can go to zero between write_queue state updates and firing the resulting segments out. As FRTO processing occurs during that window the check must be more precise to not match "spuriously" :-). More specificly, e.g., when packets_in_flight is zero but FLAG_DATA_ACKED is true the problematic branch that set cwnd into zero would not be taken and new segments might be sent out later. Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> Tested-by: Eric Dumazet <edumazet@google.com> Acked-by: Neal Cardwell <ncardwell@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| | * tcp: frto should not set snd_cwnd to 0Eric Dumazet2013-02-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ Upstream commit 2e5f421211ff76c17130b4597bc06df4eeead24f ] Commit 9dc274151a548 (tcp: fix ABC in tcp_slow_start()) uncovered a bug in FRTO code : tcp_process_frto() is setting snd_cwnd to 0 if the number of in flight packets is 0. As Neal pointed out, if no packet is in flight we lost our chance to disambiguate whether a loss timeout was spurious. We should assume it was a proper loss. Reported-by: Pasi Kärkkäinen <pasik@iki.fi> Signed-off-by: Neal Cardwell <ncardwell@google.com> Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> Cc: Yuchung Cheng <ycheng@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| | * net: sctp: sctp_endpoint_free: zero out secret key dataDaniel Borkmann2013-02-141-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ Upstream commit b5c37fe6e24eec194bb29d22fdd55d73bcc709bf ] On sctp_endpoint_destroy, previously used sensitive keying material should be zeroed out before the memory is returned, as we already do with e.g. auth keys when released. Signed-off-by: Daniel Borkmann <dborkman@redhat.com> Acked-by: Vlad Yasevich <vyasevic@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| | * net: sctp: sctp_setsockopt_auth_key: use kzfree instead of kfreeDaniel Borkmann2013-02-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ Upstream commit 6ba542a291a5e558603ac51cda9bded347ce7627 ] In sctp_setsockopt_auth_key, we create a temporary copy of the user passed shared auth key for the endpoint or association and after internal setup, we free it right away. Since it's sensitive data, we should zero out the key before returning the memory back to the allocator. Thus, use kzfree instead of kfree, just as we do in sctp_auth_key_put(). Signed-off-by: Daniel Borkmann <dborkman@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| | * sctp: refactor sctp_outq_teardown to insure proper re-initalizationNeil Horman2013-02-141-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ Upstream commit 2f94aabd9f6c925d77aecb3ff020f1cc12ed8f86 ] Jamie Parsons reported a problem recently, in which the re-initalization of an association (The duplicate init case), resulted in a loss of receive window space. He tracked down the root cause to sctp_outq_teardown, which discarded all the data on an outq during a re-initalization of the corresponding association, but never reset the outq->outstanding_data field to zero. I wrote, and he tested this fix, which does a proper full re-initalization of the outq, fixing this problem, and hopefully future proofing us from simmilar issues down the road. Signed-off-by: Neil Horman <nhorman@tuxdriver.com> Reported-by: Jamie Parsons <Jamie.Parsons@metaswitch.com> Tested-by: Jamie Parsons <Jamie.Parsons@metaswitch.com> CC: Jamie Parsons <Jamie.Parsons@metaswitch.com> CC: Vlad Yasevich <vyasevich@gmail.com> CC: "David S. Miller" <davem@davemloft.net> CC: netdev@vger.kernel.org Acked-by: Vlad Yasevich <vyasevich@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| | * atm/iphase: rename fregt_t -> ffreg_tHeiko Carstens2013-02-141-73/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ Upstream commit ab54ee80aa7585f9666ff4dd665441d7ce41f1e8 ] We have conflicting type qualifiers for "freg_t" in s390's ptrace.h and the iphase atm device driver, which causes the compile error below. Unfortunately the s390 typedef can't be renamed, since it's a user visible api, nor can I change the include order in s390 code to avoid the conflict. So simply rename the iphase typedef to a new name. Fixes this compile error: In file included from drivers/atm/iphase.c:66:0: drivers/atm/iphase.h:639:25: error: conflicting type qualifiers for 'freg_t' In file included from next/arch/s390/include/asm/ptrace.h:9:0, from next/arch/s390/include/asm/lowcore.h:12, from next/arch/s390/include/asm/thread_info.h:30, from include/linux/thread_info.h:54, from include/linux/preempt.h:9, from include/linux/spinlock.h:50, from include/linux/seqlock.h:29, from include/linux/time.h:5, from include/linux/stat.h:18, from include/linux/module.h:10, from drivers/atm/iphase.c:43: next/arch/s390/include/uapi/asm/ptrace.h:197:3: note: previous declaration of 'freg_t' was here Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Acked-by: chas williams - CONTRACTOR <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
generated by cgit v1.1 at 2025-01-11 07:30:34 +0000