GIT 13f67553a85b7a1692626b951555d3d2d1783506 git://www.linux-mips.org/pub/scm/upstream.git#for-akpm commit Author: Ralf Baechle Date: Tue Feb 6 16:43:31 2007 +0000 [MIPS] Yosemite: Fix missing parens in SERIAL_READ_1 macro Signed-off-by: Ralf Baechle commit 93d2164103f301cc01d05561949f04e707b3c0c1 Author: Yoichi Yuasa Date: Tue Feb 6 10:59:22 2007 +0900 [MIPS] Fix warnings in run_uncached on 32bit kernel arch/mips/lib/uncached.c: In function 'run_uncached': arch/mips/lib/uncached.c:47: warning: comparison is always true due to limited range of data type arch/mips/lib/uncached.c:48: warning: comparison is always false due to limited range of data type arch/mips/lib/uncached.c:57: warning: comparison is always true due to limited range of data type arch/mips/lib/uncached.c:58: warning: comparison is always false due to limited range of data type Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 2650b54dfd5bcf564f8caffda5b07be125d6a07e Author: Chris Dearman Date: Thu Feb 1 19:54:13 2007 +0000 [MIPS] Comment fix Signed-off-by: Chris Dearman Signed-off-by: Ralf Baechle commit 3ddb773211a8dfea9284b6b389749dbaf2b80b87 Author: Ralf Baechle Date: Sun Feb 4 23:23:00 2007 +0000 [MIPS] MT: Nuke duplicate mips_mt_regdump() prototype. Signed-off-by: Ralf Baechle commit f9e997aa177b7e84d7eba2675aa0138964cbc73d Author: Alexander Bigga Date: Thu Dec 21 11:25:19 2006 +0100 [MIPS] Alchemy: Fix PCI-memory access The problem was introduced in 2.6.18.3 with the casting of some 36bit-defines (PCI memory) in au1000.h to resource_size_t which may be u32 or u64 depending on the experimental CONFIG_RESOURCES_64BIT. With unset CONFIG_RESOURCES_64BIT, the pci-memory cannot be accessed because the ioremap in arch/mips/au1000/common/pci.c already used the truncated addresses. With set CONFIG_RESOURCES_64BIT, things get even worse, because PCI-scan aborts, due to resource conflict: request_resource() in arch/mips/pci/pci.c fails because the maximum iomem-address is 0xffffffff (32bit) but the pci-memory-start-address is 0x440000000 (36bit). To get pci working again, I propose the following patch: 1. remove the resource_size_t-casting from au1000.h again 2. make the casting in arch/mips/au1000/common/pci.c (it's allowed and necessary here. The 36bit-handling will be done in __fixup_bigphys_addr). With this patch pci works again like in 2.6.18.2, the gcc-compile warnings in pci.c are gone and it doesn't depend on CONFIG_EXPERIMENTAL. Signed-off-by: Alexander Bigga Signed-off-by: Ralf Baechle commit 769e0b9d2b30bfb9d301ebc24c7c83e6c5b7a2cb Author: Chris Dearman Date: Thu Feb 1 19:54:13 2007 +0000 [MIPS] Move .set reorder out of conditional code Signed-off-by: Chris Dearman Signed-off-by: Ralf Baechle commit 906f95e5d2e8c22118ce72b8b5e8303d2eec6802 Author: Chris Dearman Date: Thu Feb 1 19:54:13 2007 +0000 [MIPS] Check FCSR for pending interrupts before restoring from a context. Signed-off-by: Chris Dearman Signed-off-by: Ralf Baechle commit 0acac5b61b5526ee82a20ada4f4353a32d218f31 Author: Ralf Baechle Date: Tue Nov 7 09:23:57 2006 +0000 [MIPS] Jaguar ATX: Fix large number of warnings. Signed-off-by: Ralf Baechle commit 19c5d0e8722ea69a03fed45be47049ebc1f56a51 Author: Ralf Baechle Date: Tue Nov 7 09:25:51 2006 +0000 [MIPS] Jaguar: Fix MAC address detection after platform_device conversion. Signed-off-by: Ralf Baechle commit 903f8f1dcf783d47c0764bbb22f3df5bd179f579 Author: Ralf Baechle Date: Mon Feb 5 00:33:21 2007 +0000 [MIPS] SMTC: Make a bunch of functions and variables static. Signed-off-by: Ralf Baechle commit 3790062e51b4ab9b02c5547e4b1781c458c093b8 Author: Joseph S. Myers Date: Wed Jan 10 12:30:50 2007 +0000 [MIPS] Use compat_sys_pselect6 The N32 and O32 pselect6 syscalls need to use compat_sys_pselect6 to translate arguments from 32-bit to 64-bit layout. Signed-off-by: Joseph Myers Signed-off-by: Ralf Baechle commit c223022fd9817b03c618c05ad0c4f7b4db83b3af Author: Ralf Baechle Date: Mon Feb 5 00:34:20 2007 +0000 [MIPS] SMTC: Cleanup idle hook invocation. Signed-off-by: Ralf Baechle commit 9228128e94844dc32b2646a1272e92d8ea148e26 Author: David Quigley Date: Wed Jun 28 09:36:46 2006 -0400 [MIPS] SELinux: Add security hooks to mips-mt {get,set}affinity This patch adds LSM hooks into the setaffinity and getaffinity functions for the mips architecture to enable security modules to control these operations between tasks with different security attributes. This implementation uses the existing task_setscheduler and task_getscheduler LSM hooks. Signed-Off-By: David Quigley Acked-by: Stephen Smalley Signed-off-by: James Morris Signed-off-by: Ralf Baechle commit 963f364cc5f6d8cb83702d7676d64f85c57f208b Author: Ralf Baechle Date: Mon Feb 5 00:05:08 2007 +0000 [MIPS] IRIX: Linux coding style cleanups. Signed-off-by: Ralf Baechle commit 8946acebefb7ac1a541a6ea25b8240dd87a89c35 Author: Ralf Baechle Date: Tue Nov 7 10:19:05 2006 +0000 [MIPS] PB1100: Fix pile of warnings CC arch/mips/au1000/pb1100/board_setup.o arch/mips/au1000/pb1100/board_setup.c: In function ‘board_setup’: arch/mips/au1000/pb1100/board_setup.c:104: warning: passing argument 1 of ‘readb’ makes pointer from integer without a cast arch/mips/au1000/pb1100/board_setup.c:105: warning: passing argument 1 of ‘readb’ makes pointer from integer without a cast arch/mips/au1000/pb1100/board_setup.c:105: warning: passing argument 2 of ‘writeb’ makes pointer from integer without a cast arch/mips/au1000/pb1100/board_setup.c:109: warning: passing argument 1 of ‘readb’ makes pointer from integer without a cast arch/mips/au1000/pb1100/board_setup.c:110: warning: passing argument 1 of ‘readb’ makes pointer from integer without a cast arch/mips/au1000/pb1100/board_setup.c:110: warning: passing argument 2 of ‘writeb’ makes pointer from integer without a cast arch/mips/au1000/pb1100/board_setup.c:51: warning: unused variable ‘sys_clksrc’ arch/mips/au1000/pb1100/board_setup.c:51: warning: unused variable ‘sys_freqctrl’ arch/mips/au1000/pb1100/board_setup.c:50: warning: unused variable ‘pin_func’ Signed-off-by: Ralf Baechle commit 60d5d821a8e8095665a96db0bec45a989132aa03 Author: Ralf Baechle Date: Tue Nov 7 09:58:30 2006 +0000 [MIPS] Alchemy: Fix bunch of warnings CC arch/mips/au1000/common/pci.o arch/mips/au1000/common/pci.c:42: warning: large integer implicitly truncated to unsigned type arch/mips/au1000/common/pci.c:43: warning: large integer implicitly truncated to unsigned type arch/mips/au1000/common/pci.c:49: warning: large integer implicitly truncated to unsigned type arch/mips/au1000/common/pci.c:50: warning: large integer implicitly truncated to unsigned type arch/mips/au1000/common/pci.c: In function ‘au1x_pci_setup’: arch/mips/au1000/common/pci.c:82: warning: ISO C90 forbids mixed declarations and code Signed-off-by: Ralf Baechle commit 2167b5699dda522b16b1a1166d134c34aaca5e7c Author: Ralf Baechle Date: Mon Feb 5 00:10:11 2007 +0000 [MIPS] Whitespace cleanups. Signed-off-by: Ralf Baechle commit da240c0c8e1507caeac4644ddd95f8e84d1d5996 Author: Ralf Baechle Date: Tue Nov 7 10:22:31 2006 +0000 [MIPS] Alchemy: Fix bunch more warnings. Signed-off-by: Ralf Baechle commit 1f2bb52e97061e83f1f8922404814ae3f64dd5e5 Author: Ahmed S. Darwish Date: Mon Feb 5 04:42:11 2007 +0200 [MIPS] Use ARRAY_SIZE macro when appropriate Signed-off-by: Ahmed S. Darwish Signed-off-by: Ralf Baechle commit 75daa8e9ac475433dc81d3706b380fb8d1682486 Author: Jan Altenberg Date: Thu Jan 25 20:46:14 2007 +0100 [MIPS] Fix some whitespace damage Signed-off-by: Jan Altenberg Signed-off-by: Ralf Baechle commit 754d10bee9c0900f0be4de1a0679908dcc672a58 Author: Mathieu Desnoyers Date: Sat Feb 3 23:16:51 2007 -0500 [MIPS] Add missing ifdef arch/mips/pmc-sierra/yosemite/setup.c early_serial_setup is only defined when CONFIG_SERIAL_8250 is set. Signed-off-by: Mathieu Desnoyers Signed-off-by: Ralf Baechle commit 5c151ca0521c642ecf5d0704487d6a4f1073dc6f Author: Atsushi Nemoto Date: Sun Feb 4 00:57:25 2007 +0900 [MIPS] Fix pb1200/irqmap.c and apply some missed patches pb1200/irqmap.c had been broken a while due to non-named initializer and had missed some recent IRQ related changes. Apply these commits to this file. [MIPS] IRQ cleanups commit 1603b5aca4f15b34848fb5594d0c7b6333b99144 [MIPS] use generic_handle_irq, handle_level_irq, handle_percpu_irq commit 1417836e81c0ab8f5a0bfeafa90d3eaa41b2a067 [MIPS] Compile __do_IRQ() when really needed commit e77c232cfc6e1250b2916a7c69225d6634d05a49 Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 40b2562adf9f7d0687c91f3f015e92a774d654d7 Author: Ralf Baechle Date: Fri Feb 2 11:13:35 2007 +0000 [MIPS] Do not allow oprofile to be enabled on SMTC. Oprofile cannot work on SMTC due to the limited number of counters. Signed-off-by: Ralf Baechle commit 2286d4ed0ee39975ba79cff7a8551c3d29e4d364 Author: Robert P. J. Day Date: Thu Feb 1 05:45:14 2007 -0500 [MIPS] Remove superfluous "ifdef CONFIG_KGDB". Given that the Makefiles involved already have conditional compilation of the form: obj-$(CONFIG_KGDB) += dbg_io.o there seems to be little value for the dbg_io.c source files to check that config variable yet again. Signed-off-by: Robert P. J. Day Signed-off-by: Ralf Baechle commit a135d26cf2a95dab79f282acf54aa9a7e1e7b6de Author: Ralf Baechle Date: Tue Feb 6 16:54:03 2007 +0000 [MIPS] vpe_elfload and vpe_run are only used locally, make them static. Signed-off-by: Ralf Baechle commit 0efbe42cccfbfe0ecd7d3251b7d395e53ad5549a Author: Ralf Baechle Date: Tue Feb 6 16:54:02 2007 +0000 [MIPS] SMTC: remove unused atomic_postclear Signed-off-by: Ralf Baechle commit be60afa43b2b9e2caee634999efc66ccfd841880 Author: Atsushi Nemoto Date: Wed Jan 24 01:21:05 2007 +0900 [MIPS] Move some kernel globals from asm file to C file. This get rid of some undesirable hole in BSS section due to random order of placement. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 6b23feffbfaca891e9fca0c56e2ce965a9d457f8 Author: Atsushi Nemoto Date: Tue Jan 23 22:29:06 2007 +0900 [MIPS] Remove _fdata from asm-mips/sections.h There is no _fdata symbol in kernel. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit a9f33ac6e65b0e7b500c3c880c22735b71da7ea1 Author: Ralf Baechle Date: Tue Feb 6 16:54:01 2007 +0000 [MIPS] Kconfig: Provide sane NR_CPUS defaults for more configurations Signed-off-by: Ralf Baechle commit ae3d6898e9f4803a56a387f58e00ae45b6cacde4 Author: Yoichi Yuasa Date: Thu Jan 18 22:27:11 2007 +0900 [MIPS] vr41xx: Use symbolic names for IRQ numers Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 5d14773d3eaec4ead09b20cc1d6b65c76c0a1d1b Author: Atsushi Nemoto Date: Mon Jan 15 00:07:25 2007 +0900 [MIPS] use name instead of typename for each irq_chip The "typename" field was obsoleted by the "name" field. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit d7da2d1570a1aa2f4ae4a559d4dbe2bd19c16a3c Author: Atsushi Nemoto Date: Tue Jan 16 23:29:11 2007 +0900 [MIPS] Kconfig: Move some entries to appropriate menu Currently KEXEC is in "Machine selection", SECCOMP, PM, APM are in "Executable file formats" menu. Move KEXEC and SECCOMP to "Kernel type" and PM, APM to new "Power management options" menu. Also replace "config PM" with kernel/power/Kconfig. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 6c1638c8d388755f0aaa2d00ff65ea1bc2bc9ca0 Author: Yoichi Yuasa Date: Thu Jan 11 23:53:18 2007 +0900 [MIPS] vr41xx: add MACINT controls This patch has added MACINT controls. They are necessary for VR4133 ethernet driver. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 246a7333243a4128a11bd6d022c5c014a9f8674e Author: Franck Bui-Huu Date: Wed Jan 10 09:44:05 2007 +0100 [MIPS] FLATMEM: introduce PHYS_OFFSET. The old code was assuming that min_low_pfn was always 0. This means that platforms having a big hole at their memory start paid the price of wasting some memory for the allocation of unused entries in mem_map[]. This patch prevents this waste. It introduces PHYS_OFFSET define which is the start of the physical memory and uses it wherever needed. Specially when converting physical/virtual addresses into virtual/physical ones. Currently all platforms defines PHYS_OFFSET to 0. Signed-off-by: Franck Bui-Huu Signed-off-by: Ralf Baechle commit e3fcfaabbf81966a3ccf8e82713218a7d7f88f03 Author: Franck Bui-Huu Date: Wed Jan 10 09:44:04 2007 +0100 [MIPS] Setup min_low_pfn/max_low_pfn correctly This patch makes a better usage of these two globals. 'min_low_pfn' is now correctly setup for all configs, which allow us to rely on it in boot memory code init. Signed-off-by: Franck Bui-Huu Signed-off-by: Ralf Baechle commit eda260523fa38d9b7fc20cb1c08d4c79006133fd Author: Atsushi Nemoto Date: Mon Dec 18 00:07:40 2006 +0900 [MIPS] Unify memset.S The 32-bit version and 64-bit version are almost equal. Unify them. This makes further improvements (for example, supporting CDEX, etc.) easier. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 2da1ababd5d7ff90fd10500dc9528291903c23a6 Author: Atsushi Nemoto Date: Sat Dec 30 00:43:59 2006 +0900 [MIPS] prom_free_prom_memory cleanup Current prom_free_prom_memory() implementations are almost same as free_init_pages(), or no-op. Make free_init_pages() extern (again) and make prom_free_prom_memory() use it. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit dac386364e42d7a120486eba28f96eaa70775a27 Author: Atsushi Nemoto Date: Sun Jan 14 23:41:42 2007 +0900 [MIPS] Make I8259A_IRQ_BASE customizable Move I8259A_IRQ_BASE from asm/i8259.h to asm/mach-generic/irq.h and make it really customizable. And remove I8259_IRQ_BASE declared on some platforms. Currently only NEC_CMBVR4133 is using custom I8259A_IRQ_BASE value. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 3133c948446ce88aa8803721fd40c387549c8da6 Author: Atsushi Nemoto Date: Mon Jan 8 02:14:29 2007 +0900 [MIPS] Define MIPS_CPU_IRQ_BASE in generic header The irq_base for {mips,rm7k,rm9k}_cpu_irq_init() are constant on all platforms and are same value on most platforms (0 or 16, depends on CONFIG_I8259). Define them in asm-mips/mach-generic/irq.h and make them customizable. This will save a few cycle on each CPU interrupt. A good side effect is removing some dependencies to MALTA in generic SMTC code. Although MIPS_CPU_IRQ_BASE is customizable, this patch changes irq mappings on DDB5477, EMMA2RH and MIPS_SIM, since really customizing them might cause some header dependency problem and there seems no good reason to customize it. So currently only VR41XX is using custom MIPS_CPU_IRQ_BASE value, which is 0 regardless of CONFIG_I8259. Testing this patch on those platforms is greatly appreciated. Thank you. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit d90a662661c025cd8a745c18fc4945e061c11c7a Author: Atsushi Nemoto Date: Mon Jan 8 00:20:24 2007 +0900 [MIPS] Remove unused rm9k_cpu_irq_disable() rm9k_cpu_irq_disable() is unused since commit 1603b5aca4f15b34848fb5594d0c7b6333b99144. Remove it. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle arch/mips/Kconfig | 32 ++++++++++++++++++++ arch/mips/kernel/linux32.c | 47 ++++++++++++++++++++++++++++++ arch/mips/kernel/signal.c | 6 ++++ arch/mips/momentum/jaguar_atx/platform.c | Unmerged 4 files changed, 85 insertions(+), 0 deletions(-) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index a92ce6b..99518b2 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -2076,11 +2076,43 @@ config BINFMT_ELF32 bool default y if MIPS32_O32 || MIPS32_N32 +<<<<<<< HEAD/arch/mips/Kconfig endmenu menu "Power management options" source "kernel/power/Kconfig" +======= +config PM + bool "Power Management support (EXPERIMENTAL)" + depends on EXPERIMENTAL && SOC_AU1X00 + +config APM + tristate "Advanced Power Management Emulation" + depends on PM + ---help--- + APM is a BIOS specification for saving power using several different + techniques. This is mostly useful for battery powered systems with + APM compliant BIOSes. If you say Y here, the system time will be + reset after a RESUME operation, the /proc/apm device will provide + battery status information, and user-space programs will receive + notification of APM "events" (e.g. battery status change). + + In order to use APM, you will need supporting software. For location + and more information, read and the + Battery Powered Linux mini-HOWTO, available from + . + + This driver does not spin down disk drives (see the hdparm(8) + manpage ("man 8 hdparm") for that), and it doesn't turn off + VESA-compliant "green" monitors. + + Generally, if you don't have a battery in your machine, there isn't + much point in using this driver and you should say N. If you get + random kernel OOPSes or reboots that don't seem to be related to + anything, try disabling/enabling this option (or disabling/enabling + APM in your BIOS). +>>>>>>> /arch/mips/Kconfig endmenu diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c index fc4dd6c..2d68a9d 100644 --- a/arch/mips/kernel/linux32.c +++ b/arch/mips/kernel/linux32.c @@ -194,6 +194,53 @@ sysn32_waitid(int which, compat_pid_t pi return ret; } +<<<<<<< HEAD/arch/mips/kernel/linux32.c +======= +struct sysinfo32 { + s32 uptime; + u32 loads[3]; + u32 totalram; + u32 freeram; + u32 sharedram; + u32 bufferram; + u32 totalswap; + u32 freeswap; + u16 procs; + u32 totalhigh; + u32 freehigh; + u32 mem_unit; + char _f[8]; +}; + +asmlinkage int sys32_sysinfo(struct sysinfo32 __user *info) +{ + struct sysinfo s; + int ret, err; + mm_segment_t old_fs = get_fs (); + + set_fs (KERNEL_DS); + ret = sys_sysinfo((struct sysinfo __user *)&s); + set_fs (old_fs); + err = put_user (s.uptime, &info->uptime); + err |= __put_user (s.loads[0], &info->loads[0]); + err |= __put_user (s.loads[1], &info->loads[1]); + err |= __put_user (s.loads[2], &info->loads[2]); + err |= __put_user (s.totalram, &info->totalram); + err |= __put_user (s.freeram, &info->freeram); + err |= __put_user (s.sharedram, &info->sharedram); + err |= __put_user (s.bufferram, &info->bufferram); + err |= __put_user (s.totalswap, &info->totalswap); + err |= __put_user (s.freeswap, &info->freeswap); + err |= __put_user (s.procs, &info->procs); + err |= __put_user (s.totalhigh, &info->totalhigh); + err |= __put_user (s.freehigh, &info->freehigh); + err |= __put_user (s.mem_unit, &info->mem_unit); + if (err) + return -EFAULT; + return ret; +} + +>>>>>>> /arch/mips/kernel/linux32.c #define RLIM_INFINITY32 0x7fffffff #define RESOURCE32(x) ((x > RLIM_INFINITY32) ? RLIM_INFINITY32 : x) diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c index b2e9ab1..d35e104 100644 --- a/arch/mips/kernel/signal.c +++ b/arch/mips/kernel/signal.c @@ -434,8 +434,14 @@ int setup_frame(struct k_sigaction * ka, DEBUGP("SIG deliver (%s:%d): sp=0x%p pc=0x%lx ra=0x%lx\n", current->comm, current->pid, +<<<<<<< HEAD/arch/mips/kernel/signal.c frame, regs->cp0_epc, regs->regs[31]); return 0; +======= + frame, regs->cp0_epc, frame->regs[31]); +#endif + return 0; +>>>>>>> /arch/mips/kernel/signal.c give_sigsegv: force_sigsegv(signr, current); * Unmerged path arch/mips/momentum/jaguar_atx/platform.c