diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-10-27 14:11:07 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-10-27 14:11:07 +0100 |
commit | 85c24cd8d3676cbae9e8809e894e68025c6d497e (patch) | |
tree | 024c4b655c1a8e6943ed8e75b64be38980508cfe /arch/arc/kernel/head.S | |
parent | 49d776ffb50f2e428aafb6a6576e58e80f1e886c (diff) | |
parent | d1d0b6b668818571122d30d68a0b3f768bd83a52 (diff) |
Merge branch 'for-linus' into for-next
Merged upstream branch to make further fireworks development easier
(and avoid conflicts earlier).
Conflicts:
sound/firewire/bebob/bebob_focusrite.c
Diffstat (limited to 'arch/arc/kernel/head.S')
-rw-r--r-- | arch/arc/kernel/head.S | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arc/kernel/head.S b/arch/arc/kernel/head.S index 4d2481bd8b9..b0e8666fdcc 100644 --- a/arch/arc/kernel/head.S +++ b/arch/arc/kernel/head.S @@ -91,16 +91,6 @@ stext: st r0, [@uboot_tag] st r2, [@uboot_arg] - ; Identify if running on ISS vs Silicon - ; IDENTITY Reg [ 3 2 1 0 ] - ; (chip-id) ^^^^^ ==> 0xffff for ISS - lr r0, [identity] - lsr r3, r0, 16 - cmp r3, 0xffff - mov.z r4, 0 - mov.nz r4, 1 - st r4, [@running_on_hw] - ; setup "current" tsk and optionally cache it in dedicated r25 mov r9, @init_task SET_CURR_TASK_ON_CPU r9, r0 ; r9 = tsk, r0 = scratch |