diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2013-04-03 19:38:10 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-10 18:01:37 +0100 |
commit | 15fb7e2183e4a99e3031b16accb98722cb8959c3 (patch) | |
tree | 5a93583e6b43e16f50296838ae20fc9d06db3781 | |
parent | cb4db44c14959ca76870cfaf02b5d314ac68ba8f (diff) | |
download | poky-15fb7e2183e4a99e3031b16accb98722cb8959c3.tar.gz |
linux/yocto: update AUTOFS configuration
When systemd is enabled, qemumips failed to boot with the following trace:
Reserved instruction in kernel code[#1]:
Cpu 0
$ 0 : 00000000 80232500 c0011000 80000000
$ 4 : c0017440 00000000 87032400 8704b000
$ 8 : 00000000 00000000 00000010 003fffff
$12 : 00000000 7fafbab4 00000000 87d6fbb0
$16 : 87f98780 c0017440 c0017440 00000000
$20 : 8704a000 00000000 8704a000 00000000
$24 : 00000010 80480630
$28 : 87c22000 87c23e28 7fafbc00 80232408
Hi : 00000000
Lo : 00000000
epc : c0011000 autofs_mount+0x0/0x30 [autofs4]
Not tainted
ra : 80232408 mount_fs+0x68/0x200
Status: 1000a403 KERNEL EXL IE
Cause : d0808028
PrId : 00019300 (MIPS 24Kc)
Modules linked in: autofs4
Process systemd (pid: 1, threadinfo=87c22000, task=87c28000, tls=77787490)
Stack : 809b3e28 802512bc 00000000 808b0da4 87f3d310 87936c38 87032400 8704b000
87f98780 c0017440 00000020 8704b000 87032400 87032480 00000000 80251a2c
00000006 8022f7fc 87032480 802507f0 00000000 87032400 8704b000 7fafba94
00000000 c0017440 8088275c 80253f40 7fafb9d0 00000016 38513fac 0051b2a8
8704b000 801df604 00000000 0000000a 87f5c000 801f5968 87f3d310 87936c38
...
Call Trace:
[<c0011000>] autofs_mount+0x0/0x30 [autofs4]
[<80232408>] mount_fs+0x68/0x200
[<80251a2c>] vfs_kern_mount+0x68/0x114
[<80253f40>] do_mount+0x218/0x9d0
[<8025479c>] sys_mount+0xa4/0xec
[<8010c07c>] stack_done+0x20/0x44
The policy of building AUTOFS as a module is something that can be
changed, since boot processes that use automounting can take advantage
of the built in support to reduce complexity.
The size increase of the base policy is small with this change, and
users of the linux-yocto kernel can still override this value, which
is exactly what the poky-tiny kernel does.
Keeping the configuration consistent for all boards, and not adding
and exception for qemumips makes sense in this case.
[YOCTO #4129]
(From OE-Core rev: 3570cf11b7dfa6991c43bb041abb9d47cc6f0d70)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.8.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb index 903fcb5c17..3632a28650 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb | |||
@@ -10,7 +10,7 @@ KMETA = "meta" | |||
10 | 10 | ||
11 | SRCREV_machine ?= "abd0728b164f651292374e96251ee197b50e3c02" | 11 | SRCREV_machine ?= "abd0728b164f651292374e96251ee197b50e3c02" |
12 | SRCREV_machine_qemuppc ?= "1619988b773840ec546292a9cd65dda99d55b96c" | 12 | SRCREV_machine_qemuppc ?= "1619988b773840ec546292a9cd65dda99d55b96c" |
13 | SRCREV_meta ?= "1b534b2f8bbe9b8a773268cfa30a4850346f6f5f" | 13 | SRCREV_meta ?= "70dac5a56c245ca01d2d4e18fc2c9fb112749bf3" |
14 | 14 | ||
15 | PR = "${INC_PR}.0" | 15 | PR = "${INC_PR}.0" |
16 | PV = "${LINUX_VERSION}+git${SRCPV}" | 16 | PV = "${LINUX_VERSION}+git${SRCPV}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.8.bb b/meta/recipes-kernel/linux/linux-yocto_3.8.bb index 10fc693d0e..c589fa00eb 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.8.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.8.bb | |||
@@ -9,7 +9,7 @@ SRCREV_machine_qemuppc ?= "f8848d222d1fcd1ebc517d28f289735621708449" | |||
9 | SRCREV_machine_qemux86 ?= "42ddf06111efe45f3c36012d5a04a1eeb9781f42" | 9 | SRCREV_machine_qemux86 ?= "42ddf06111efe45f3c36012d5a04a1eeb9781f42" |
10 | SRCREV_machine_qemux86-64 ?= "42ddf06111efe45f3c36012d5a04a1eeb9781f42" | 10 | SRCREV_machine_qemux86-64 ?= "42ddf06111efe45f3c36012d5a04a1eeb9781f42" |
11 | SRCREV_machine ?= "42ddf06111efe45f3c36012d5a04a1eeb9781f42" | 11 | SRCREV_machine ?= "42ddf06111efe45f3c36012d5a04a1eeb9781f42" |
12 | SRCREV_meta ?= "1b534b2f8bbe9b8a773268cfa30a4850346f6f5f" | 12 | SRCREV_meta ?= "70dac5a56c245ca01d2d4e18fc2c9fb112749bf3" |
13 | 13 | ||
14 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.8.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" | 14 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.8.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" |
15 | 15 | ||