Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
linux/arch/mips/include/asm
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
..
dec
…
emma
…
fw MIPS: Kconfig: Rename several firmware related config symbols. 2012-12-13 17:02:14 +01:00
ip32
…
lasat
…
mach-ar7 MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
mach-ath79 MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
mach-au1x00 MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
mach-bcm47xx 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
mach-bcm63xx 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
mach-cavium-octeon MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
mach-cobalt MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
mach-db1x00 MIPS: Alchemy: Merge PB1100/1500 support into DB1000 code. 2012-10-11 11:11:20 +02:00
mach-dec MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
mach-emma2rh MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
mach-generic MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
mach-ip22 MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
mach-ip27 MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
mach-ip28 MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
mach-ip32 MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
mach-jazz MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
mach-jz4740 MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
mach-lantiq 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
mach-lasat MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
mach-loongson MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
mach-loongson1 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
mach-malta MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
mach-netlogic 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
mach-pnx833x MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
mach-pnx8550 MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
mach-powertv MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
mach-rc32434 MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
mach-rm MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
mach-sead3 MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
mach-sibyte MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
mach-tx39xx MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
mach-tx49xx MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
mach-vr41xx MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
mach-wrppmc MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
mips-boards Merge branch 'ralf-3.7' of git://git.linux-mips.org/pub/scm/sjhill/linux-sjhill into mips-for-linux-next 2012-09-28 16:29:55 +02:00
netlogic MIPS: Netlogic: Support for XLR/XLS Fast Message Network 2012-11-09 11:37:20 +01:00
octeon MIPS: OCTEON: Add definitions for OCTEON memory contoller registers. 2012-12-13 18:15:25 +01:00
pci
…
pmc-sierra/msp71xx MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
sgi
…
sibyte UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers 2012-10-02 18:01:25 +01:00
sn
…
txx9
…
vr41xx
…
xtalk
…
Kbuild tracing,x86: Add a TSC trace_clock 2012-11-13 15:48:27 -05:00
abi.h
…
addrspace.h
…
amon.h
…
arch_hweight.h
…
asm-offsets.h
…
asm.h
…
asmmacro-32.h
…
asmmacro-64.h
…
asmmacro.h
…
atomic.h Improve atomic.h robustness 2012-10-11 11:02:36 +02:00
barrier.h
…
bcache.h
…
bitops.h MIPS: Remove irqflags.h dependency from bitops.h 2012-11-09 10:59:10 +01:00
bmips.h
…
bootinfo.h
…
branch.h
…
break.h
…
bug.h
…
bugs.h
…
cache.h
…
cacheflush.h
…
cacheops.h
…
cevt-r4k.h
…
checksum.h
…
clkdev.h
…
clock.h
…
cmp.h
…
cmpxchg.h
…
compat-signal.h compat: move compat_siginfo_t definition to asm/compat.h 2012-10-06 03:05:16 +09:00
compat.h MIPS: compat: Implement is_compat_task() by testing for 32-bit address space. 2012-11-09 10:58:29 +01:00
compiler.h
…
cop2.h
…
cpu-features.h MIPS: Add detection of DSP ASE Revision 2. 2012-10-11 11:05:03 +02:00
cpu-info.h
…
cpu.h MIPS: Remove R5000A. 2012-11-26 13:41:05 +01:00
cputime.h
…
current.h
…
debug.h
…
delay.h MIPS: Make __{,n,u}delay declarations match definitions and generic delay.h 2012-10-16 22:20:03 +02:00
device.h
…
div64.h
…
dma-mapping.h
…
dma.h
…
ds1287.h
…
dsp.h
…
edac.h
…
elf.h
…
emergency-restart.h
…
errno.h UAPI: (Scripted) Disintegrate arch/mips/include/asm 2012-10-09 09:47:14 +01:00
exec.h
…
fb.h
…
fixmap.h
…
floppy.h
…
fpregdef.h
…
fpu.h
…
fpu_emulator.h
…
ftrace.h
…
futex.h
…
gcmpregs.h
…
gic.h MIPS: Code clean-ups for the GIC. 2012-09-13 15:43:48 -05:00
gio_device.h
…
gpio.h
…
gt64120.h
…
hardirq.h
…
hazards.h MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
highmem.h
…
hugetlb.h MIPS: Avoid mcheck by flushing page range in huge_ptep_set_access_flags() 2012-12-04 16:57:54 +01:00
hw_irq.h
…
i8259.h
…
ide.h
…
inst.h
…
io.h MIPS: Remove irqflags.h dependency from bitops.h 2012-11-09 10:59:10 +01:00
irq.h
…
irq_cpu.h
…
irq_gt641xx.h
…
irq_regs.h
…
irqflags.h MIPS: Make irqflags.h functions preempt-safe for non-mipsr2 cpus 2012-11-09 10:59:21 +01:00
isadep.h
…
jazz.h
…
jazzdma.h
…
jump_label.h
…
kdebug.h
…
kexec.h MIPS: kdump: Add support 2012-12-13 16:46:47 +01:00
kgdb.h
…
kmap_types.h
…
kprobes.h
…
kspd.h MIPS: MT: Remove kspd. 2012-10-11 11:14:12 +02:00
linkage.h
…
local.h
…
local64.h
…
m48t37.h
…
mc146818-time.h
…
mc146818rtc.h
…
mips_machine.h
…
mips_mt.h
…
mipsmtregs.h
…
mipsprom.h
…
mipsregs.h MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
mmu.h
…
mmu_context.h MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
mmzone.h
…
module.h MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
msc01_ic.h
…
mutex.h
…
nile4.h
…
paccess.h
…
page.h MIPS: Control huge tlb support via Kconfig symbol MIPS_HUGE_TLB_SUPPORT 2012-12-12 16:48:47 +01:00
parport.h
…
pci.h
…
percpu.h
…
perf_event.h
…
pgalloc.h
…
pgtable-32.h
…
pgtable-64.h MIPS: Transparent Huge Pages support 2012-12-12 16:48:52 +01:00
pgtable-bits.h MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
pgtable.h Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2012-12-14 14:27:45 -08:00
pmon.h
…
prefetch.h
…
processor.h Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2012-12-14 14:27:45 -08:00
prom.h
…
ptrace.h MIPS: Switch over to generic sys_execve and kernel_execve. 2012-10-14 19:31:30 -04:00
r4k-timer.h MIPS: Synchronize MIPS count one CPU at a time 2012-08-17 10:57:28 +02:00
r4kcache.h
…
reboot.h
…
reg.h
…
regdef.h
…
rm9k-ocd.h
…
rtlx.h
…
scatterlist.h
…
seccomp.h
…
sections.h
…
segment.h
…
serial.h
…
setup.h UAPI: (Scripted) Disintegrate arch/mips/include/asm 2012-10-09 09:47:14 +01:00
sgialib.h
…
sgiarcs.h MIPS: Kconfig: Rename several firmware related config symbols. 2012-12-13 17:02:14 +01:00
shmparam.h
…
sigcontext.h UAPI: (Scripted) Disintegrate arch/mips/include/asm 2012-10-09 09:47:14 +01:00
siginfo.h UAPI: (Scripted) Disintegrate arch/mips/include/asm 2012-10-09 09:47:14 +01:00
signal.h unify default ptrace_signal_deliver 2012-11-29 00:01:23 -05:00
sim.h
…
smp-ops.h
…
smp.h MIPS: kdump: Add support 2012-12-13 16:46:47 +01:00
smtc.h
…
smtc_ipi.h
…
smtc_proc.h
…
sni.h
…
socket.h UAPI: (Scripted) Disintegrate arch/mips/include/asm 2012-10-09 09:47:14 +01:00
sparsemem.h MIPS: Control huge tlb support via Kconfig symbol MIPS_HUGE_TLB_SUPPORT 2012-12-12 16:48:47 +01:00
spinlock.h
…
spinlock_types.h
…
spram.h
…
stackframe.h
…
stacktrace.h
…
string.h
…
suspend.h
…
switch_to.h
…
termios.h UAPI: (Scripted) Disintegrate arch/mips/include/asm 2012-10-09 09:47:14 +01:00
thread_info.h MIPS: compat: Delete now unused TIF_32BIT. 2012-11-09 10:58:36 +01:00
time.h MIPS: Remove usage of CEVT_R4K_LIB config option. 2012-12-13 18:15:24 +01:00
timex.h
…
tlb.h
…
tlbdebug.h
…
tlbflush.h
…
tlbmisc.h
…
topology.h
…
traps.h
…
txx9irq.h
…
txx9pio.h
…
txx9tmr.h
…
types.h UAPI: (Scripted) Disintegrate arch/mips/include/asm 2012-10-09 09:47:14 +01:00
uaccess.h
…
uasm.h MIPS: uasm: Add INS and EXT instructions. 2012-09-13 15:43:53 -05:00
ucontext.h
…
unaligned.h
…
unistd.h mips: switch to saner kernel_execve() semantics 2012-10-15 16:27:52 -04:00
user.h
…
vdso.h
…
vga.h
…
vpe.h
…
war.h MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
watch.h
…
wbflush.h
…
xor.h
…