diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-02-12 22:45:44 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-02-12 22:45:44 -0800 |
| commit | 0b8a83c2e5b112a9b75e6ceb0013bd9769c32dac (patch) | |
| tree | 3340d680bd43dd64e0ee3a00c7cd521112540a81 | |
| parent | 8d7755777425bb3154c37e8d2c2c3b45cc254b30 (diff) | |
| parent | 4f247d753a8865cd16292ff0b720b72c28049786 (diff) | |
| download | system_core-0b8a83c2e5b112a9b75e6ceb0013bd9769c32dac.tar.gz system_core-0b8a83c2e5b112a9b75e6ceb0013bd9769c32dac.tar.bz2 system_core-0b8a83c2e5b112a9b75e6ceb0013bd9769c32dac.zip | |
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/system/core into 1.1
Android 4.2.2 release 1
| -rw-r--r-- | fs_mgr/fs_mgr.c | 4 | ||||
| -rw-r--r-- | libcorkscrew/arch-arm/ptrace-arm.c | 11 | ||||
| -rw-r--r-- | rootdir/init.rc | 2 | ||||
| -rw-r--r-- | rootdir/init.usb.rc | 1 |
4 files changed, 12 insertions, 6 deletions
diff --git a/fs_mgr/fs_mgr.c b/fs_mgr/fs_mgr.c index 538b5be2..99adb81d 100644 --- a/fs_mgr/fs_mgr.c +++ b/fs_mgr/fs_mgr.c @@ -523,11 +523,11 @@ int fs_mgr_do_mount(char *fstab_file, char *n_name, char *n_blk_dev, char *tmp_m /* We found our match */ /* First check the filesystem if requested */ if (fstab[i].fs_mgr_flags & MF_WAIT) { - wait_for_file(fstab[i].blk_dev, WAIT_TIMEOUT); + wait_for_file(n_blk_dev, WAIT_TIMEOUT); } if (fstab[i].fs_mgr_flags & MF_CHECK) { - check_fs(fstab[i].blk_dev, fstab[i].type, fstab[i].mnt_point); + check_fs(n_blk_dev, fstab[i].type, fstab[i].mnt_point); } /* Now mount it where requested */ diff --git a/libcorkscrew/arch-arm/ptrace-arm.c b/libcorkscrew/arch-arm/ptrace-arm.c index 868230ce..78a9ea9a 100644 --- a/libcorkscrew/arch-arm/ptrace-arm.c +++ b/libcorkscrew/arch-arm/ptrace-arm.c @@ -29,12 +29,15 @@ static void load_exidx_header(pid_t pid, map_info_t* mi, uintptr_t* out_exidx_start, size_t* out_exidx_size) { uint32_t elf_phoff; - uint32_t elf_phentsize_phnum; + uint32_t elf_phentsize_ehsize; + uint32_t elf_shentsize_phnum; if (try_get_word_ptrace(pid, mi->start + offsetof(Elf32_Ehdr, e_phoff), &elf_phoff) + && try_get_word_ptrace(pid, mi->start + offsetof(Elf32_Ehdr, e_ehsize), + &elf_phentsize_ehsize) && try_get_word_ptrace(pid, mi->start + offsetof(Elf32_Ehdr, e_phnum), - &elf_phentsize_phnum)) { - uint32_t elf_phentsize = elf_phentsize_phnum >> 16; - uint32_t elf_phnum = elf_phentsize_phnum & 0xffff; + &elf_shentsize_phnum)) { + uint32_t elf_phentsize = elf_phentsize_ehsize >> 16; + uint32_t elf_phnum = elf_shentsize_phnum & 0xffff; for (uint32_t i = 0; i < elf_phnum; i++) { uintptr_t elf_phdr = mi->start + elf_phoff + i * elf_phentsize; uint32_t elf_phdr_type; diff --git a/rootdir/init.rc b/rootdir/init.rc index 39154aee..b9f1d14b 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -303,6 +303,8 @@ on boot chown system system /sys/devices/system/cpu/cpufreq/interactive/boostpulse chown system system /sys/devices/system/cpu/cpufreq/interactive/input_boost chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/input_boost + chown system system /sys/devices/system/cpu/cpufreq/interactive/boostpulse_duration + chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/boostpulse_duration # Assume SMP uses shared cpufreq policy for all CPUs chown system system /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor diff --git a/rootdir/init.usb.rc b/rootdir/init.usb.rc index 15467cc2..f37b630b 100644 --- a/rootdir/init.usb.rc +++ b/rootdir/init.usb.rc @@ -88,4 +88,5 @@ on property:sys.usb.config=accessory,audio_source,adb # Used to set USB configuration at boot and to switch the configuration # when changing the default configuration on property:persist.sys.usb.config=* + setprop sys.usb.config none setprop sys.usb.config ${persist.sys.usb.config} |