leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
d5757dbe79
linux/arch/mips/mm
History
Linus Torvalds cebfa85eb8 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 
Pull MIPS updates from Ralf Baechle:
 "The MIPS bits for 3.8.  This also includes a bunch fixes that were
  sitting in the linux-mips.org git tree for a long time.  This pull
  request contains updates to several OCTEON drivers and the board
  support code for BCM47XX, BCM63XX, XLP, XLR, XLS, lantiq, Loongson1B,
  updates to the SSB bus support, MIPS kexec code and adds support for
  kdump.

  When pulling this, there are two expected merge conflicts in
  include/linux/bcma/bcma_driver_chipcommon.h which are trivial to
  resolve, just remove the conflict markers and keep both alternatives."

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (90 commits)
  MIPS: PMC-Sierra Yosemite: Remove support.
  VIDEO: Newport Fix console crashes
  MIPS: wrppmc: Fix build of PCI code.
  MIPS: IP22/IP28: Fix build of EISA code.
  MIPS: RB532: Fix build of prom code.
  MIPS: PowerTV: Fix build.
  MIPS: IP27: Correct fucked grammar in ops-bridge.c
  MIPS: Highmem: Fix build error if CONFIG_DEBUG_HIGHMEM is disabled
  MIPS: Fix potencial corruption
  MIPS: Fix for warning from FPU emulation code
  MIPS: Handle COP3 Unusable exception as COP1X for FP emulation
  MIPS: Fix poweroff failure when HOTPLUG_CPU configured.
  MIPS: MT: Fix build with CONFIG_UIDGID_STRICT_TYPE_CHECKS=y
  MIPS: Remove unused smvp.h
  MIPS/EDAC: Improve OCTEON EDAC support.
  MIPS: OCTEON: Add definitions for OCTEON memory contoller registers.
  MIPS: OCTEON: Add OCTEON family definitions to octeon-model.h
  ata: pata_octeon_cf: Use correct byte order for DMA in when built little-endian.
  MIPS/OCTEON/ata: Convert pata_octeon_cf.c to use device tree.
  MIPS: Remove usage of CEVT_R4K_LIB config option.
  ...
2012-12-14 14:27:45 -08:00
..
c-octeon.c MIPS/EDAC: Improve OCTEON EDAC support. 2012-12-13 18:15:26 +01:00
c-r3k.c Disintegrate asm/system.h for MIPS 2012-03-28 18:30:02 +01:00
c-r4k.c Merge branch 'mips-next' of http://dev.phrozen.org/githttp/mips-next into mips-for-linux-next 2012-12-13 19:40:13 +01:00
c-tx39.c Disintegrate asm/system.h for MIPS 2012-03-28 18:30:02 +01:00
cache.c MIPS: Replace 'kernel_uses_smartmips_rixi' with 'cpu_has_rixi'. 2012-09-13 17:00:34 -05:00
cerr-sb1.c MIPS: Sibyte: Use hweight8 instead of counting bits 2009-12-17 01:57:16 +00:00
cex-gen.S
cex-oct.S MIPS: Add Cavium OCTEON processor support files to arch/mips/cavium-octeon. 2009-01-11 09:57:21 +00:00
cex-sb1.S Fix common misspellings 2011-03-31 11:26:23 -03:00
dma-default.c MIPS: adapt for dma_map_ops changes 2012-03-28 16:36:32 +02:00
extable.c MIPS: Eleminate filenames from comments 2009-08-03 17:52:40 +01:00
fault.c Merge branch 'akpm' (Andrew's patch-bomb) 2012-10-09 16:23:15 +09:00
gup.c MIPS: mm: Add compound tail page _mapcount when mapped 2012-08-27 16:10:21 +02:00
highmem.c MIPS: Highmem: Fix build error if CONFIG_DEBUG_HIGHMEM is disabled 2012-12-13 18:15:27 +01:00
hugetlbpage.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
init.c MIPS: Align swapper_pg_dir to 64K for better TLB Refill code. 2012-10-11 11:02:40 +02:00
ioremap.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
Makefile MIPS: introduce CPU_R4K_CACHE_TLB 2012-08-22 23:46:38 +02:00
mmap.c mm: use vm_unmapped_area() on mips architecture 2012-12-11 17:22:26 -08:00
page-funcs.S MIPS: Refactor 'clear_page' and 'copy_page' functions. 2012-07-19 11:23:43 +02:00
page.c MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
pgtable-32.c MIPS: Limit fixrange_init() to the FIXMAP region 2011-07-25 17:26:54 +01:00
pgtable-64.c MIPS: Transparent Huge Pages support 2012-12-12 16:48:52 +01:00
sc-ip22.c Disintegrate asm/system.h for MIPS 2012-03-28 18:30:02 +01:00
sc-mips.c Disintegrate asm/system.h for MIPS 2012-03-28 18:30:02 +01:00
sc-r5k.c Disintegrate asm/system.h for MIPS 2012-03-28 18:30:02 +01:00
sc-rm7k.c MIPS: RM7000: Symbol should be static 2010-10-04 18:33:54 +01:00
tlb-r3k.c Disintegrate asm/system.h for MIPS 2012-03-28 18:30:02 +01:00
tlb-r4k.c Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2012-12-14 14:27:45 -08:00
tlb-r8k.c Disintegrate asm/system.h for MIPS 2012-03-28 18:30:02 +01:00
tlbex-fault.S
tlbex.c Merge branch 'mips-next' of http://dev.phrozen.org/githttp/mips-next into mips-for-linux-next 2012-12-13 19:40:13 +01:00
uasm.c MIPS: uasm: Add INS and EXT instructions. 2012-09-13 15:43:53 -05:00