Commit Graph

2505 Commits

Author SHA1 Message Date
Huang, Tao
46f1476d2d rk: gcc-wrapper.py fix psci ignore
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-06-02 14:26:58 +08:00
Huang, Tao
ceaf071f79 rk: gcc-wrapper.py ignore sysctl_net_core.c:24
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-20 15:34:59 +08:00
Huang, Tao
f07d7eb591 Merge tag 'lsk-v3.10-15.04-android'
Conflicts:
	drivers/base/cpu.c
	drivers/misc/Kconfig
	drivers/misc/Makefile
2015-05-05 10:51:31 +08:00
Huang, Tao
bff22aebd0 rk: gcc-wrapper.py ignore psci.c
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-04 21:04:37 +08:00
Huang, Tao
be3d562d8c rk: gcc-wrapper.py ignore compat_binfmt_elf.c:58
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-04 19:00:03 +08:00
Alex Shi
b674d6ecd4 Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2015-04-15 20:08:38 +08:00
Peter Kümmel
ef684a4f49 kconfig: Fix warning "‘jump’ may be used uninitialized"
Warning:
In file included from scripts/kconfig/zconf.tab.c:2537:0:
scripts/kconfig/menu.c: In function ‘get_symbol_str’:
scripts/kconfig/menu.c:590:18: warning: ‘jump’ may be used uninitialized in this function [-Wmaybe-uninitialized]
     jump->offset = strlen(r->s);

Simplifies the test logic because (head && local) means (jump != 0)
and makes GCC happy when checking if the jump pointer was initialized.

Signed-off-by: Peter Kümmel <syntheticpp@gmx.net>
Signed-off-by: Michal Marek <mmarek@suse.cz>
(cherry picked from commit 2d56030609)
Signed-off-by: Jon Medhurst <tixy@linaro.org>
2015-04-15 20:03:08 +08:00
Martin Walch
b04591efd2 kconfig: fix bug in search results string: use strlen(gstr->s), not gstr->len
The struct gstr has a capacity that may differ from the actual string length.

However, a string manipulation in the function search_conf made the assumption
that it is the same, which led to messing up some search results, especially
when the content of the gstr in use had not yet reached at least 63 chars.

Signed-off-by: Martin Walch <walch.martin@web.de>
Acked-by: Wang YanQing <udknight@gmail.com>
Acked-by: Benjamin Poirier <bpoirier@suse.de>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
(cherry picked from commit 503c823048)
Signed-off-by: Jon Medhurst <tixy@linaro.org>
2015-04-15 20:03:08 +08:00
Tim Gardner
1e8ac3b467 scripts/sortextable: suppress warning: `relocs_size' may be used uninitialized
In file included from scripts/sortextable.c:194:0:
scripts/sortextable.c: In function `main':
scripts/sortextable.h:176:3: warning: `relocs_size' may be used uninitialized in this function [-Wmaybe-uninitialized]
   memset(relocs, 0, relocs_size);
   ^
scripts/sortextable.h:106:6: note: `relocs_size' was declared here
  int relocs_size;
      ^
In file included from scripts/sortextable.c:192:0:
scripts/sortextable.h:176:3: warning: `relocs_size' may be used uninitialized in this function [-Wmaybe-uninitialized]
   memset(relocs, 0, relocs_size);
   ^
scripts/sortextable.h:106:6: note: `relocs_size' was declared here
  int relocs_size;
      ^

gcc 4.9.1

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Reviewed-by: Jamie Iles <jamie.iles@oracle.com>

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit 7cbc0ea79d)
Signed-off-by: Jon Medhurst <tixy@linaro.org>
2015-04-15 20:03:08 +08:00
Huang, Tao
1ca180425c Merge tag 'lsk-v3.10-android-15.02'
LSK Android 15.02 v3.10

Conflicts:
	drivers/Kconfig
	drivers/regulator/core.c
	include/linux/of.h
2015-03-05 17:11:40 +08:00
hwg
6461fc6fcb Revert "support different wifi bt chip auto compatible"
This reverts commit 2506d1678c.
2015-03-04 10:46:28 +08:00
hwg
2506d1678c support different wifi bt chip auto compatible
arch/arm64/boot/dts/rk3368-p9_818.dts
 arch/arm64/boot/dts/rk3368-tb_8846.dts
2015-03-04 10:44:44 +08:00
Mark Brown
def31719e1 Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android
Conflicts:
	drivers/Kconfig
	drivers/Makefile
	fs/pstore/inode.c
	fs/pstore/ram.c
2015-02-20 14:29:33 +09:00
Amit Pundir
ecfe0b5f15 Merge branch 'android-3.10' of https://android.googlesource.com/kernel/common into linaro-android-3.10-lsk
* android-3.10: (60 commits)
  kbuild: make it possible to specify the module output dir
  xt_qtaguid: Use sk_callback_lock read locks before reading sk->sk_socket
  ipv6: clean up anycast when an interface is destroyed
  usb: gadget: check for accessory device before disconnecting HIDs
  staging: android: ashmem: add missing include
  usb: gadget: android: Save/restore ep0 completion function
  selinux: Remove obsolete selinux_audit_data initialization.
  selinux: make the netif cache namespace aware
  selinux: correctly label /proc inodes in use before the policy is loaded
  selinux: fix inode security list corruption
  selinux: put the mmap() DAC controls before the MAC controls
  selinux: reduce the number of calls to synchronize_net() when flushing caches
  [PATCH 5/5] pstore: selinux: add security in-core xattr support for pstore and debugfs
  SELinux: Update policy version to support constraints info
  [PATCH v4 4/5] pstore: add pmsg
  [PATCH 3/5] pstore: handle zero-sized prz in series
  [PATCH v2 2/5] pstore: remove superfluous memory size check
  [PATCH v4 1/5] pstore: use snprintf
  pstore: clarify clearing of _read_cnt in ramoops_context
  prctl: make PR_SET_TIMERSLACK_PID pid namespace aware
  ...

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

Conflicts:
	drivers/staging/android/Kconfig
2015-02-12 16:39:41 +08:00
Huang, Tao
089c13477b Merge tag 'lsk-v3.10-android-15.01'
LSK Android 15.01 v3.10

Conflicts:
	arch/arm/Kconfig.debug
	arch/arm64/mm/init.c
	drivers/Makefile
	drivers/cpufreq/cpufreq_interactive.c
2015-02-10 16:24:25 +08:00
Rom Lemarchand
f5aa3045b1 kbuild: make it possible to specify the module output dir
Make modinst_dir user-defined on the command line.

This allows to do things like:
make MODLIB=output/ modinst_dir=. modules_install

to ensure all the .ko are in the output/ directory.

Change-Id: I2bc007eea27ee744d35289e26e4a8ac43ba04151
Signed-off-by: Rom Lemarchand <romlem@android.com>
(cherry picked from commit ae7f28e5aa168a008c153ccff7cc437066d016c3)
2015-02-06 00:35:08 +00:00
Mark Brown
43b74bf7c6 Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2015-02-02 11:29:26 +00:00
Mark Brown
692d96aa22 Merge tag 'v3.10.67' into linux-linaro-lsk
This is the 3.10.67 stable release
2015-02-02 11:29:07 +00:00
Michael Karcher
0d9928f365 scripts/recordmcount.pl: There is no -m32 gcc option on Super-H anymore
commit 1caf6aaaa4 upstream.

Compiling SH with gcc-4.8 fails due to the -m32 option not being
supported.

From http://buildd.debian-ports.org/status/fetch.php?pkg=linux&arch=sh4&ver=3.16.7-ckt4-1&stamp=1421425783

      CC      init/main.o
    gcc-4.8: error: unrecognized command line option '-m32'
    ld: cannot find init/.tmp_mc_main.o: No such file or directory
    objcopy: 'init/.tmp_mx_main.o': No such file
    rm: cannot remove 'init/.tmp_mx_main.o': No such file or directory
    rm: cannot remove 'init/.tmp_mc_main.o': No such file or directory

Link: http://lkml.kernel.org/r/1421537778-29001-1-git-send-email-kernel@mkarcher.dialup.fu-berlin.de
Link: http://lkml.kernel.org/r/54BCBDD4.10102@physik.fu-berlin.de

Cc: Matt Fleming <matt@console-pimps.org>
Reported-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Signed-off-by: Michael Karcher <kernel@mkarcher.dialup.fu-berlin.de>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-29 17:40:55 -08:00
Mark Brown
69487098cc Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2015-01-16 22:07:03 +00:00
Mark Brown
c293f79246 Merge tag 'v3.10.65' into linux-linaro-lsk
This is the 3.10.65 stable release
2015-01-16 22:06:35 +00:00
Johannes Berg
697f52b455 scripts/kernel-doc: don't eat struct members with __aligned
commit 7b990789a4 upstream.

The change from \d+ to .+ inside __aligned() means that the following
structure:

  struct test {
        u8 a __aligned(2);
        u8 b __aligned(2);
  };

essentially gets modified to

  struct test {
        u8 a;
  };

for purposes of kernel-doc, thus dropping a struct member, which in
turns causes warnings and invalid kernel-doc generation.

Fix this by replacing the catch-all (".") with anything that's not a
semicolon ("[^;]").

Fixes: 9dc30918b2 ("scripts/kernel-doc: handle struct member __aligned without numbers")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Cc: Nishanth Menon <nm@ti.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Michal Marek <mmarek@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-16 06:59:02 -08:00
Amit Pundir
4f1d8e6268 Merge branch 'upstream/android-3.10' into 'linaro-fixes/android-3.10' 2014-09-01 16:54:38 +05:30
Ard Biesheuvel
197028d295 cpu: add generic support for CPU feature based module autoloading
This patch adds support for advertising optional CPU features over udev
using the modalias, and for declaring compatibility with/dependency upon
such a feature in a module.

The mapping between feature numbers and actual features should be provided
by the architecture in a file called <asm/cpufeature.h> which exports the
following functions/macros:
- cpu_feature(FEAT), a preprocessor macro that maps token FEAT to a
  numeric index;
- bool cpu_have_feature(n), returning whether this CPU has support for
  feature #n;
- MAX_CPU_FEATURES, an upper bound for 'n' in the previous function.

The feature can then be enabled by setting CONFIG_GENERIC_CPU_AUTOPROBE
for the architecture.

For instance, a module that registers its module init function using

  module_cpu_feature_match(FEAT_X, module_init_function)

will be probed automatically when the CPU's support for the 'FEAT_X'
feature is advertised over udev, and will only allow the module to be
loaded by hand if the 'FEAT_X' feature is supported.

Change-Id: Icae8e3ff347235fc72a5b41279f0afdb34fb161a
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-08-28 10:22:26 -07:00
黄涛
fcef60e36f Merge tag 'lsk-v3.10-android-14.07' into develop-3.10
LSK v3.10 Android 14.07 release

Conflicts:
	drivers/clocksource/arm_arch_timer.c
	lib/Makefile
2014-08-06 15:34:14 +08:00