summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-03-19Staging: cxt1e1: Fix externs should be avoided in .c files in comet.cEbru Akagunduz
Fix checkpatch.pl issues with externs should be avoided in comet.c Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19Staging: cxt1e1: Fix use of volatile is usually wrong in comet.cEbru Akagunduz
Fix checkpatch.pl issues with use of volatile is usually wrong in comet.c Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19staging: rtl8821ae: Fix braces {} are not necessary.Gulsah Kose
Fix checkpatch.pl issues with braces {} are not necessary in base.c Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19staging: rtl8821ae: Fix suspect code indent for conditional statementsGulsah Kose
Fix checkpatch.pl issues with suspect code indent for conditional statements (16, 16) in base.c Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19Staging: comedi: Fix line over 80 characters in s626.cEbru Akagunduz
Fix checkpatch.pl issues line over 80 characters in s626.c Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19Staging: comedi: Fix missing space after return type in s626.cEbru Akagunduz
Fix checkpatch.pl issues with missing space after return type in s626.c Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19Staging: rtl8188eu: Fix warning of braces are not necessary.Elena Oat
This patch fixes the warning of "braces are not necessary for single statement blocks" in file rtw_ieee80211.c. Signed-off-by: Elena Oat <oat.elena@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19Staging: rtl8188eu: Fix warning of space prohibited.Elena Oat
This patch fixes the warning of "space prohibited before semicolon" in file rtw_efuse.c. Signed-off-by: Elena Oat <oat.elena@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19Staging: rtl8188eu: Fix warning of braces not necessary.Elena Oat
This small patch fixes the warning of "braces are necessary for any arm of this statement" in file rtw_efuse.c. Signed-off-by: Elena Oat <oat.elena@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19Staging: rtl8188eu: Fix warnings of no space before tabs.Elena Oat
This patch fixes the warning of "please, no space before tabs" in file rtw_efuse.c. I have also modified the style of the comments for readability. Signed-off-by: Elena Oat <oat.elena@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19Staging: rtl8188eu: Fix warning of space prohibited.Elena Oat
This small patch fixes the warning of "space prohibited before semicolon" in file rtw_debug.c. Signed-off-by: Elena Oat <oat.elena@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19staging: rtl8188eu: Reduced nesting and improved coding style.Chi Pham
Signed-off-by: Chi Pham <fempsci@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19Merge branch 'timers-urgent-for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull timer fix from Thomas Gleixner: "A single bugfix: make the scheduler clock on Vybrid SoCs count forward" * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: clocksource: vf_pit_timer: use complement for sched_clock reading
2014-03-19staging:lustre:lnet: lib-types.h Fix open brace '{' err.Aybuke Ozdemir
Fix checkpatch.pl issues with open brace '{' following struct go on the same line in lib-types.h Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19staging:lustre:lnet: lib-types.h Fix unnecessary space func. pointer name.Aybuke Ozdemir
Fix checkpatch.pl issues with unnecessary space after function pointer name in lib-types.h Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19staging: lustre: add an extra lineGeorgiana Rodica Chelu
Add an extra line break between the variable declaration and the rest of the code Signed-off-by: Georgiana Rodica Chelu <georgiana.chelu93@gmail.com> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19MIPS: KVM: Remove dead code in CP0 emulationJames Hogan
The code to check whether rd > MIPS_CP0_DESAVE is dead code, since MIPS_CP0_DESAVE = 31 and rd is already masked with 0x1f. Remove it. Signed-off-by: James Hogan <james.hogan@imgtec.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Gleb Natapov <gleb@kernel.org> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Sanjay Lal <sanjayl@kymasys.com> Cc: linux-mips@linux-mips.org Cc: kvm@vger.kernel.org Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2014-03-19Staging: rtl8188eu: Fix warnings of no space before tabs.Elena Oat
This patch fixes the warnings of "please, no space before tabs" in the file rtw_mlme.c. I have also modified the comment style and removed some unnecessary tabs. Signed-off-by: Elena Oat <oat.elena@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19Staging: rtl8188eu: Fix warnings of space prohibited.Elena Oat
This patch fixes the warnings of "space prohibited between function name and open parenthesis" in file rtw_mlme.c. While at it, I have also removed unneccessary tabs. Also one comment that didn't make sense was removed. Signed-off-by: Elena Oat <oat.elena@gmail.com> Acked-by: Luis R. Rodriguez <mcgrof@do-not-panic.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19Staging: rtl8188eu: Fix warning of braces {} are not necessary.Elena Oat
This patch fixes the warning of "braces {} are not necessary for single statement blocks" in file rtw_mlme.c. I have removed the else statement in one case, as it didn't have any value. Signed-off-by: Elena Oat <oat.elena@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19MIPS: KVM: Consult HWREna before emulating RDHWRJames Hogan
The ability to read hardware registers from userland with the RDHWR instruction should depend upon the corresponding bit of the HWREna register being set, otherwise a reserved instruction exception should be generated. However KVM's current emulation ignores the guest's HWREna and always emulates RDHWR instructions even if the guest OS has disallowed them. Therefore rework the RDHWR emulation code to check for privilege or the corresponding bit in the guest HWREna bit. Also remove the #if 0 case for the UserLocal register. I presume it was there for debug purposes but it seems unnecessary now that the guest can control whether it causes a guest exception. Signed-off-by: James Hogan <james.hogan@imgtec.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Gleb Natapov <gleb@kernel.org> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Sanjay Lal <sanjayl@kymasys.com> Cc: linux-mips@linux-mips.org Cc: kvm@vger.kernel.org Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2014-03-19MIPS: KVM: Pass reserved instruction exceptions to guestJames Hogan
Previously a reserved instruction exception while in guest code would cause a KVM internal error if kvm_mips_handle_ri() didn't recognise the instruction (including a RDHWR from an unrecognised hardware register). However the guest OS should really have the opportunity to catch the exception so that it can take the appropriate actions such as sending a SIGILL to the guest user process or emulating the instruction itself. Therefore in these cases emulate a guest RI exception and only return EMULATE_FAIL if that fails, being careful to revert the PC first in case the exception occurred in a branch delay slot in which case the PC will already point to the branch target. Also turn the printk messages relating to these cases into kvm_debug messages so that they aren't usually visible. This allows crashme to run in the guest without killing the entire VM. Signed-off-by: James Hogan <james.hogan@imgtec.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Gleb Natapov <gleb@kernel.org> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Sanjay Lal <sanjayl@kymasys.com> Cc: linux-mips@linux-mips.org Cc: kvm@vger.kernel.org Cc: stable@vger.kernel.org Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2014-03-19MIPS: KVM: asm/kvm_host.h: Clean up whitespaceJames Hogan
The whitespace in asm/kvm_host.h is quite inconsistent in places. Clean up the whole file to use tabs more consistently. When you use the --ignore-space-change argument to git diff this patch only changes line wrapping in TLB_IS_GLOBAL and TLB_IS_VALID macros. Signed-off-by: James Hogan <james.hogan@imgtec.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Gleb Natapov <gleb@kernel.org> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Sanjay Lal <sanjayl@kymasys.com> Cc: linux-mips@linux-mips.org Cc: kvm@vger.kernel.org Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2014-03-19staging: vt6656: s_uGetRTSCTSRsvTime fix return.Malcolm Priestley
Always returns to __le16 type Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19staging: vt6656: vnt_rxtx_rsvtime_le16 fix return.Malcolm Priestley
Always returns to __le16 type. Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19staging: vt6656: s_uGetDataDuration use __le16.Malcolm Priestley
s_uGetDataDuration always returns to __le16 type Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19staging: vt6656: Correct return type s_uGetRTSCTSDuration.Malcolm Priestley
s_uGetRTSCTSDuration always returns in __le16 type Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19staging: vt6656: rxtx endian correct return durationMalcolm Priestley
All duration base types are __le16 correct back to cpu Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19staging: vt6656: vnt_time_stamp_off fix return to __le16Malcolm Priestley
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19staging: vt6656: struct vnt_tx_short_buf_head correct base typesMalcolm Priestley
Both variables duration and time_stamp_off are __le16 types Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19staging: vt6656: rxtx Replace wTimeStampOff* variablesMalcolm Priestley
Fix base type to __le16 and remove camel case. Camel case changes wTimeStampOff* -> time_stamp_off* Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19staging: vt6656: rxtx Replace wCTSTxRrvTime_baMalcolm Priestley
Replace with cts_rrv_time_ba with __le16 base. Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19staging: vt6656: rxtx: Replace wCTSDuration*Malcolm Priestley
Fix base type to __le16 and remove camel case. Camel case changes wCTSDuration* -> cts_duration* Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19staging: vt6656: rxtx: Replace wTxRrvTime*Malcolm Priestley
Fix base type to __le16 and remove camel case. Camel case changes wTxRrvTime* -> rrv_time* Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19staging: vt6656: rxtx: Replace wRTSTxRrvTime*Malcolm Priestley
Fix base type to __le16 and remove camel case. Camel case changes wRTSTxRrvTime* -> rts_rrv_time* Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19staging: vt6656: rxtx: Replace wRTSDuration* variablesMalcolm Priestley
Fix base type to __le16 and remove camel case. Camel case changes wRTSDuration* -> rts_duration* Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19staging: vt6656: rxtx Replace wDuration* variables.Malcolm Priestley
Fix base type to __le16 and remove camel case. Camel case changes wDuration* -> duration* Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19GFS2: inline function gfs2_set_modeBob Peterson
Here is a revised patch based on Steve's feedback: This patch eliminates function gfs2_set_mode which was only called in one place, and always returned 0. Signed-off-by: Bob Peterson <rpeterso@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2014-03-19staging: dgap: re-factor some more code for 80+ linesMark Hounschell
This patch fixes more 80+ char lines as reported by checkpatch Signed-off-by: Mark Hounschell <markh@compro.net> Tested-by: Mark Hounschell <markh@compro.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19staging: dgap: get rid of DGAP_LOCK and DGAP_UNLOCK macrosMark Hounschell
This patch replaces the DGAP_LOCK and DGAP_UNLOCK macros with spin_lock_irqsave spin_unlock_irqrestore. Signed-off-by: Mark Hounschell <markh@compro.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19staging: dgap: re-factor some code for 80+ lines as reported by checkpatchMark Hounschell
This patch re-factors some code to fix some 80+ lines as reported by checkpatch. This patch was suggested and authored by Dan Carpenter. A test case for this patch has been written and used to show the patch to be correct. Suggested-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Mark Hounschell <markh@compro.net> Tested-by: Mark Hounschell <markh@compro.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19staging: wlags49_h2: Correct comment style in wl_netdev.cMathieu Maret
Code is using C99 code style, so change them to kernel style Signed-off-by: Mathieu Maret <mathieu.maret@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19staging: wlags49_h2: remove commented code in wl_netdev.cMathieu Maret
Remove unused code under C99 comment style Signed-off-by: Mathieu Maret <mathieu.maret@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19staging: wlags49_h2: reindent wl_netdev.cMathieu Maret
As the file is using a mix between space and tab, and space instead of tab, use Lindent to fix the file Signed-off-by: Mathieu Maret <mathieu.maret@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19GFS2: Remove extraneous function gfs2_security_initBob Peterson
This patch eliminates function gfs2_security_init in favor of just calling security_inode_init_security directly. Signed-off-by: Bob Peterson <rpeterso@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2014-03-19GFS2: Increase the max number of ACLsBob Peterson
This patch increases the maximum number of ACLs from 25 to 300 for a 4K block size. The value is adjusted accordingly if the block size is smaller. Note that this is an arbitrary limit with a performance tradeoff, and that the physical limit is slightly over 500. Signed-off-by: Bob Peterson <rpeterso@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2014-03-19Merge branch 'devicetree/next-reserved-mem' into devicetree/nextGrant Likely
2014-03-19of: device_node kobject lifecycle fixesPantelis Antoniou
After the move to having device nodes be proper kobjects the lifecycle of the node needs to be controlled better. At first convert of_add_node() in the unflattened functions to of_init_node() which initializes the kobject so that of_node_get/put work correctly even before of_init is called. Afterwards introduce of_node_is_initialized & of_node_is_attached that query the underlying kobject about the state (attached means kobj is visible in sysfs) Using that make sure the lifecycle of the tree is correct at all times. Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com> [grant.likely: moved of_node_init() calls, fixed up locking, and dropped __of_populate() hunks] Signed-off-by: Grant Likely <grant.likely@linaro.org>
2014-03-19ALSA: compress: Pass through return value of open ops callbackCharles Keepax
The snd_compr_open function would always return 0 even if the compressed ops open function failed, obviously this is incorrect. Looks like this was introduced by a small typo in: commit a0830dbd4e42b38aefdf3fb61ba5019a1a99ea85 ALSA: Add a reference counter to card instance This patch returns the value from the compressed op as it should. Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Acked-by: Vinod Koul <vinod.koul@intel.com> Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2014-03-19cgroup: implement CFTYPE_ONLY_ON_DFLTejun Heo
This cftype flag makes the file only appear on the default hierarchy. This will later be used for cgroup.controllers file. Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: Li Zefan <lizefan@huawei.com>