aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-08-28Revert "timer_list: Split timer_list_show_tickdevices"tzanussi/proc_timer_list-revertTom Zanussi
This reverts commit 60cf7ea849e77c8782dee147cfb8c38d1984236e. This is a temporary workaround for the dropbearkey hang issue in 3.10.
2013-08-28Revert "timer_list: Convert timer list to be a proper seq_file"Tom Zanussi
This reverts commit b3956a896ea57f25cacd74708b8fab611543a81d. This is a temporary workaround for the dropbearkey hang issue in 3.10.
2013-08-22perf annotate: replace 'expand' with equivalent sed expressionTom Zanussi
We don't have 'expand' in our userspace so we need to accomplish the same thing using 'sed', which we do have. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
2013-08-22perf: add SLANG_INC for slang.hLiang Li
CFLAGS was previously hard coded to contain "-I/usr/include/slang" to work with hosts that have "/usr/include/slang/slang.h" as well as hosts that have "/usr/include/slang.h". This path can cause compile warnings like: cc1: warning: '/usr/include/slang' doesn't exists. or cc1: warning: include location "/usr/include/slang" is unsafe for cross-compilation [-Wpoison-system-directories] Then in some cases warnings become errors if WERROR is enabled hence build errors. To fix this issue, we can use -idirafter to downgrade the priority of the default hard coded path. We can also make the slang include directory a variable, to allow the user to specify SLANG_INC and set their own include location. And add a '=' prefix to indicate better compatibility with sysroot/cross compile cases. Signed-off-by: Liang Li <liang.li@windriver.com>
2013-08-22perf: add sgidefs.h to for mips buildsTom Zanussi
Allow Python.h to find the definitions it needs on mips i.e. get rid of the error: "_ABIN32" is not defined. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
2013-08-22perf: change --root to --prefix for python installTom Zanussi
Otherwise we get the sysroot path appended to the build path, not what we want. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
2013-08-22perf: add 'libperl not found' warningTom Zanussi
If libperl isn't found, display a message to that effect along with some hints on how to fix it. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
2013-08-22perf: use pkg-config instead of python-configTom Zanussi
Python has build flags available via pkg-config, use those at build-time instead. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
2013-08-22perf: force include of <stdbool.h>Bruce Ashfield
Large parts of perf use bool variables and assignments. Rather than depending on transient includes, we force it by including <stdbool.h> directly in perf.h Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
2013-08-22uptime: allow the optional limiting of kernel runtimeBruce Ashfield
Introduce the ability to limit the limit the uptime of a kernel. When enabled, these options set a maximum uptime on the kernel, and (optionally) trigger a clean reboot at expiration. This functionality may appear to be very close to the softdog watchdog implementation. It is. But can't be the softdog for several reasons: - The soft watchdog should be available while this functionality is active - The duration range is different between this and the softdog. The timeout available here is potentially quite a bit longer. - At expiration, there are different expiration requirements and actions. - This functionality is specific to a particular use case and should not impact mainline functionality To cleanly restart the kernel after one minute of uptime, the following config items would be required: CONFIG_UPTIME_LIMITED_KERNEL=y CONFIG_UPTIME_LIMIT_DURATION=1 CONFIG_UPTIME_LIMIT_KERNEL_REBOOT=y Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
2013-08-22FAT: Added FAT_NO_83NAMEAndrew Tridgell
This patch adds a new flag field 'FAT_NO_83NAME' for FAT files. When this flag is set on an 8.3 FAT entry, both the MSDOS and VFAT filesystems will skip the entry. For MSDOS this makes the file inaccessible. For VFAT it makes the file only accessible by the long filename. Signed-off-by: Andrew Tridgell <tridge@samba.org>
2013-08-22FAT: Add CONFIG_VFAT_NO_CREATE_WITH_LONGNAMES optionAndrew Tridgell
When this option is enabled this will refuse to create new files with long names. Accessing existing files with long names will continue to work. File names to be created must conform to the 8.3 format. Mixed case is not allowed in either the prefix or the suffix. Signed-off-by: Andrew Tridgell <tridge@samba.org> Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com> Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
2013-08-22FAT: Add CONFIG_VFAT_FS_NO_DUALNAMES optionAndrew Tridgell
This patch adds a new config option VFAT_FS_NO_DUALNAMES. When VFAT_FS_NO_DUALNAMES is enabled, VFAT will never create a file with both a long and a short filename. If a long filename is needed, then dummy bytes are stored in the 8.3 entry, and the 8.3 entry is marked as having no short name using the FAT_NO_83NAME flag. Signed-off-by: Andrew Tridgell <tridge@samba.org>
2013-08-22cryptodev: add Kbuild hooksBruce Ashfield
Hook cryptodev-linux into the kernel build as a tristate option. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
2013-08-22crypto: import cryptodev-linux 1.6Bruce Ashfield
Adding crtypdev 1.6 support from: http://download.gna.org/cryptodev-linux/cryptodev-linux-1.6.tar.gz to the kernel source tree as an integrated (versus out of tree) component. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
2013-08-22aufs: core supportBruce Ashfield
Importing core aufs3 support from: git://git.code.sf.net/p/aufs/aufs3-standalone aufs3.10 Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
2013-08-22aufs: standalone supportBruce Ashfield
Integrating aufs-standalone patch from: git://git.code.sf.net/p/aufs/aufs3-standalone aufs3.10 Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
2013-08-22aufs: aufs proc_mapBruce Ashfield
Integrating aufs-kbuild patch from: git://git.code.sf.net/p/aufs/aufs3-standalone aufs3.10 Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
2013-08-22aufs: aufs base supportBruce Ashfield
Importing aufs3-base.patch from: git://git.code.sf.net/p/aufs/aufs3-standalone aufs3.10 Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
2013-08-22aufs: kbuild patchBruce Ashfield
Integrating aufs-kbuild patch from: git://git.code.sf.net/p/aufs/aufs3-standalone aufs3.10 Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
2013-08-22yaffs2: import 2013-git-3a8580Bruce Ashfield
Importing yaffs2 support from git://www.aleph1.co.uk/yaffs2 commit ID 3a8580e503eed62cebb7b1b4fc3f3f4211010466. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
2013-08-22initramfs: allow an optional wrapper script around initramfs generationBruce Ashfield
It is sometimes useful to have a secondary script call the gen_initramfs_list.sh script. This allows special interpretation of the initramfs root filesystem or other manipulations to be injected. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
2013-08-22compiler.h: Undef before redefining __attribute_const__Khem Raj
This is required to avoid warnings like util/include/linux/compiler.h:8:0: error: "__attribute_const__" redefined [-Werror] Signed-off-by: Khem Raj <raj.khem@gmail.com>
2013-08-22vmware: include jiffies.hBruce Ashfield
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
2013-08-22Resolve jiffies wrapping about arpLi Wang
When jiffies wraps, it must be larger than the value of "updated". The solution will enhance the condition of "time_after". Signed-off-by: Li Wang <li.wang@windriver.com>
2013-08-22efi: Add patch to fix 32bit EFI service mapping (rhbz 726701)Tom Zanussi
From fedora kernel: commit 6f3e186bc7721c5b24ad90d4a751cccfccd445e6 Author: Josh Boyer <jwboyer@redhat.com> Date: Fri Aug 5 08:47:23 2011 -0400 Add patch to fix 32bit EFI service mapping (rhbz 726701) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Darren Hart <dvhart@linux.intel.com>
2013-08-22powerpc/boot: remove -Os from BOOTFLAGSBruce Ashfield
Some variants of gcc 4.5 have issues with -Os and will throw: cc1: error: Do not use -Os option if --enable-target-optspace is not set. -Os is not required to build a valid boot environment, so the easiest solution is to simply remove the boot flag. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
2013-08-22nfs: Allow default io size to be configured.Jim Somerville
Some boards need a smaller size here for performance reasons, so let's make the value configurable for those boards. Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
2013-08-22check console device file on fs when bootingBruce Ashfield
If a root filesystem is generated as non-root, one of the tell tale signs is /dev/console not being a character file. To save a whole class of questions, let's just test for the condition and let the user know. Signed-off-by: Richard Laroque <rlarocqu@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
2013-08-22mount_root: clarify error messages for when no rootfs foundPaul Gortmaker
To an end user who doesn't really know linux that well, a message like: Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(0,0) may just look like cryptic computer speak indicating some deep and complex problem, instead of the reality that they have a simple local configuration problem. Ideally it would be nice to not use the misleading "panic" at all, but since various panic notifiers are historically expecting to be called when there is no valid rootfs, we can't change that. So instead, this tries to make it 100% clear to folks of any background that it is an end user configuration issue. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Darren Hart <dvhart@linux.intel.com>
2013-08-22NFS: allow nfs root mount to use alternate rpc portsJason Wessel
Allow an nfs root mount to use alternate RPC ports for mountd and nfsd. Signed-off-by: Jason Wessel <jason.wessel@windriver.com> [forward port to 2.6.33+] Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
2013-08-22modpost: mask trivial warningsPaul Gortmaker
Newer HOSTCC will complain about various stdio fcns because they are now declared with "warn_unused_return", or because some initializers aren't filled out with values -- trivially assign values so we aren't overwhelmed with these warnings once the kernel build kicks off. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2013-08-22kbuild: exclude meta directory from distclean processingBruce Ashfield
The meta directory has some files (notably files of size 0) that are removed by Kbuild's distclean processing. Add wrs to the exclude list to prevent recursion into wrs. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
2013-08-22powerpc: serialize image targetsBruce Ashfield
The image targets need to trigger after we've build all their dependencies. To do this we add .NOTPARALLEL and ensure that the image targets are not built in parallel. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
2013-08-22arm: serialize build targetsBruce Ashfield
The image targets need to trigger after we've build all their dependencies. To do this we add .NOTPARALLEL and ensure that the image targets are not built in parallel. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
2013-08-22powerpc: add crtsavres.o to archprepare for kbuildBruce Ashfield
upstream commit da3de6df33f5f42ff9dc40093fbc884f524c9a49 adds a dependency to all kernel modules to crtsavres. This ensures that out-of-line register saves/restores work when CONFIG_CC_OPTIMIZE_FOR_SIZE is enabled. What it didn't do was ensure that it was built when modules_prepare was run and hence out of tree powerpc kernel modules can't properly link. The fix is to add crtsavres.o to the archprepare rule in the arch/powerpc/Makefile Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
2013-08-22powerpc: kexec fix for powerpc64Benjamin Walsh
slbia instruction invalidates the SLB, but there was a hang on the first instruction that caused an SLB miss exception. Doing a full sync after the slbia causes the SLB to be in a consistent state for the handling of the SLB exception. Signed-off by: Benjamin Walsh <benjamin.walsh@windriver.com>
2013-08-22powerpc: Add unwind information for SPE registers of E500 coreLiming Wang
SPE registers use the high part bit0~bit31 of E500 GPR0~GPR31. The unwind information in "eh_frame" section is used during exception handling and describes register information in the signal frame. But current unwind information doesn't cover SPE registers, which have been saved in the signal frame. This patch adds this unwind information to "eh_frame" section. SPE registers use register number 1200+N to identify register 'N', but they start from 113 in unwind column, which is computed from gcc source code, macro DWARF_REG_TO_UNWIND_COLUMN: #define FIRST_PSEUDO_REGISTER 114 #define DWARF_REG_TO_UNWIND_COLUMN(r) \ ((r) > 1200 ? ((r) - 1200 + FIRST_PSEUDO_REGISTER - 1) : (r)) Signed-off-by: Liming Wang <liming.wang@windriver.com>
2013-08-22mips support preemptible kernelTiejun Chen
Some warning message result from calling function, smp_processor_id(), if enable preempt option. So we should do explicitly somewhere when running preemptible kernel, especially for some cache operation. Signed-off-by: Tiejun Chen <tiejun.chen@windriver.com>
2013-08-224kc cache tlb hazard: tlbp cache coherencyWeixing Shi
Add a no-op before tlbp, to avoid DMA cache coherency issues that cause data loss seen on unmount. Signed-off-by: <weixing.shi@windriver.com> Weixing Shi Signed-off-by: <james.perkins@windriver.com> James Perkins
2013-08-22malta uhci quirks: make allowance for slow 4k(e)cWeixing Shi
This works around an unexpected IRQ #255 seen during initial USB host mass storage device initialization and access. * wait up to 50us for HCRESET to clear, a slow 4kc needs a longer time. * leave FSBR enabled so that a slow 4kec/24kec will not be overwhelmed. Signed-off-by: <weixing.shil@windriver.com> Weixing Shi Signed-off-by: <bruce.ashfield@windriver.com> Bruce Ashfield
2013-08-22arm: ARM EABI socketcallMark Asselstine
This patch make that the sys_socketcall system call is available when EABI is used. The reason is that the user-space applications in both glibc_std rootfs and glibc_small rootfs are still using sys_socketcall to request kernel service. Signed-off-by: Zumeng Chen <zumeng.chen@windriver.com>
2013-08-22ARM: LPAE: Invalidate the TLB for module addresses during translation faultCatalin Marinas
commit cf9b5a26876adb266aa1ba8a0b08669389a2e301 in repository: git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git During the free_pgtables() call all user and modules/pkmap entries are removed. If a translation fault for the modules/pkmap area occurs before we switched away from the current pgd, do_translation_fault() would copy the init_mm pud into the user pud. There is a small window between pud_clear() and pmd_free_tlb() in free_pmd_range() where the pud entry was cleared but the TLB has not been invalidated yet and the CPU may have cached the original (valid) pud entry in the TLB. A scenario like below would get stuck in continuous prefetch abort: 1. Current process exiting. The modules pmd entries not populated 2. exit_mmap() -> ... -> pmd_free_tlb() 3. pud_clear() for the 1GB pud containing user stack and modules (no TLB invalidation yet) 4. Interrupt -> module interrupt routine 5. Level 2 (pmd) translation fault occurs when executing the module interrupt routine. The CPU previously cached (TLB) the old valid pud value for the modules area, so we don't get a level 1 translation fault 6. do_translation fault() copies the pud_k into the pud 7. Linux returns to the faulty instruction. Goes back to 5 At point 7, since the CPU still has the old pud value, it goes back to point 5 and never gets out of this loop. With this patch, the stale pud TLB entry is invalidated after point 6 and the subsequent prefetch abort doesn't occur. Reported-by: Tony Thompson <Anthony.Thompson@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2013-08-22kgit: creating baseline stateBruce Ashfield
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
2013-08-20Linux 3.10.9Greg Kroah-Hartman
2013-08-20Revert "genetlink: fix family dump race"Greg Kroah-Hartman
This reverts commit aab4f8d490ef8c184d854d5f630438c10406765c, commit 58ad436fcf49810aa006016107f494c9ac9013db upstream, as it causes problems. Cc: Johannes Berg <johannes.berg@intel.com> Cc: Andrei Otcheretianski <andrei.otcheretianski@intel.com> Cc: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-20Linux 3.10.8Greg Kroah-Hartman
2013-08-20cpuset: fix the return value of cpuset_write_u64()Li Zefan
commit a903f0865a190f8778c73df1a810ea6e25e5d7cf upstream. Writing to this file always returns -ENODEV: # echo 1 > cpuset.memory_pressure_enabled -bash: echo: write error: No such device Signed-off-by: Li Zefan <lizefan@huawei.com> Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-20jbd2: Fix use after free after error in jbd2_journal_dirty_metadata()Jan Kara
commit 91aa11fae1cf8c2fd67be0609692ea9741cdcc43 upstream. When jbd2_journal_dirty_metadata() returns error, __ext4_handle_dirty_metadata() stops the handle. However callers of this function do not count with that fact and still happily used now freed handle. This use after free can result in various issues but very likely we oops soon. The motivation of adding __ext4_journal_stop() into __ext4_handle_dirty_metadata() in commit 9ea7a0df seems to be only to improve error reporting. So replace __ext4_journal_stop() with ext4_journal_abort_handle() which was there before that commit and add WARN_ON_ONCE() to dump stack to provide useful information. Reported-by: Sage Weil <sage@inktank.com> Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-20s390: Fix broken buildGuenter Roeck
commit 215b28a5308f3d332df2ee09ef11fda45d7e4a92 upstream. Fix this build error: In file included from fs/exec.c:61:0: arch/s390/include/asm/tlb.h:35:23: error: expected identifier or '(' before 'unsigned' arch/s390/include/asm/tlb.h:36:1: warning: no semicolon at end of struct or union [enabled by default] arch/s390/include/asm/tlb.h: In function 'tlb_gather_mmu': arch/s390/include/asm/tlb.h:57:5: error: 'struct mmu_gather' has no member named 'end' Broken due to commit 2b047252d0 ("Fix TLB gather virtual address range invalidation corner cases"). Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Guenter Roeck <linux@roeck-us.net> [ Oh well. We had build testing for ppc amd um, but no s390 - Linus ] Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>