Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Merge test into next #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 35 commits into from
Feb 6, 2015
Merged

Merge test into next #1

Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
6d5f6a0
powerpc/fsl_pci: Fix pci stack build bug with FRAME_WARN
kimphill Jan 23, 2015
e8d2081
powerpc/dts: Remove T4240 emulator support
Jan 21, 2015
238cac1
powerpc: Remove duplicate tlbcam_index declarations
Jan 21, 2015
d2caa3c
powerpc/perf: fix fsl_emb_pmu_start to write correct pmc value
Jan 20, 2015
a7b9f67
powerpc32: adds handling of _PAGE_RO
chleroy Jan 19, 2015
cadbfd0
powerpc/8xx: use _PAGE_RO instead of _PAGE_RW
chleroy Jan 19, 2015
7f93c9d
power/fsl: add MDIO dt binding for FMan
Jan 28, 2015
debddd9
powerpc/8xx: reduce pressure on TLB due to context switches
chleroy Jan 19, 2015
2374d0a
powerpc/8xx: remove remaining unnecessary code in FixupDAR
chleroy Jan 20, 2015
5ddb75c
powerpc/8xx: remove tests on PGDIR entry validity
chleroy Jan 20, 2015
ce67f5d
powerpc32: Use kmem_cache memory for PGDIR
chleroy Jan 20, 2015
17bb312
powerpc/8xx: Take benefit of aligned PGDIR
chleroy Jan 20, 2015
fde5a90
powerpc/8xx: Optimise access to swapper_pg_dir
chleroy Jan 20, 2015
4545ff7
powerpc/8xx: Remove duplicated code in set_context()
chleroy Jan 20, 2015
974ff4e
powerpc: Add machine_check cpu function for e300c3 cpus
Jan 6, 2015
cbe8c43
powerpc/config: Enable MDIO support
puppybane Dec 23, 2014
bb344ca
powerpc/mpc85xx: Add ranges to etsec2 nodes
Dec 18, 2014
2727ed5
powerpc/85xx: Add support for Emerson/Artesyn MVME2500.
abogani Dec 11, 2014
c3e09b3
memory/fsl-corenet-cf: Add t1040 support
Dec 11, 2014
1ee9df4
dt/bindings: b/qman: Fix the alloc-ranges in the example(s)
Dec 8, 2014
7af98c7
dt/bindings: b/qman: Add phandle to the portals
Dec 8, 2014
39b55b5
powerpc/mpc85xx: Create dts components for the FSL QorIQ DPAA BMan
kumargala Dec 8, 2014
de58824
powerpc/mpc85xx: Create dts components for the FSL QorIQ DPAA QMan
kumargala Dec 8, 2014
fd5f491
powerpc: dts: pq3/85xx: Fix GPIO address
abogani Dec 4, 2014
8ac6e99
PowerPC-83xx: Deletion of an unnecessary check before the function ca…
elfring Nov 22, 2014
5db4312
powerpc/qe: Use strlcpy()
Jul 26, 2014
0d7d9b3
perf/powerpc: reset event hw state when adding it to the PMU
alexandrusardan Jun 26, 2014
c9111a4
powerpc: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
computersforpeace May 1, 2014
0dc294f
powerpc/mm: bail out early when flushing TLB page
Jan 30, 2015
a604c96
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/…
mpe Feb 4, 2015
7f43e71
powerpc/powernv: Add OPAL soft-poweroff routine
shenki Jan 30, 2015
c2c896b
powerpc/mm: Warn on flushing tlb page in kernel context
Feb 4, 2015
b087e61
cxl: Export optional AFU configuration record in sysfs
Feb 4, 2015
3d5be03
cxl: Fail AFU initialisation if an invalid configuration record is found
Feb 4, 2015
a6130ed
cxl: Add missing return statement after handling AFU errror
Feb 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
powerpc/8xx: Remove duplicated code in set_context() 
Signed-off-by: Christophe Leroy <[email protected]>
Signed-off-by: Scott Wood <[email protected]>
  • Loading branch information
@chleroy
chleroy authored and Scott Wood committed Jan 30, 2015
commit 4545ff7ed841df77a239a22bffed4fc977a7d7bc
10 changes: 4 additions & 6 deletions arch/powerpc/kernel/head_8xx.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -850,23 +850,21 @@ _GLOBAL(set_context)
*/
li r5, (swapper_pg_dir-PAGE_OFFSET)@l
sub r4, r4, r5
tophys (r4, r4)
#ifdef CONFIG_8xx_CPU6
lis r6, cpu6_errata_word@h
ori r6, r6, cpu6_errata_word@l
tophys (r4, r4)
li r7, 0x3f80
stw r7, 12(r6)
lwz r7, 12(r6)
#endif
mtspr SPRN_M_TW, r4 /* Update pointeur to level 1 table */
#ifdef CONFIG_8xx_CPU6
li r7, 0x3380
stw r7, 12(r6)
lwz r7, 12(r6)
mtspr SPRN_M_CASID, r3 /* Update context */
#else
mtspr SPRN_M_CASID,r3 /* Update context */
tophys (r4, r4)
mtspr SPRN_M_TW, r4 /* and pgd */
#endif
mtspr SPRN_M_CASID, r3 /* Update context */
SYNC
blr

Expand Down