ACPI video hotkey: export missing ACPI video hotkey events via input layer

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e9dab1960ac9746fa34eff726b81635147615a79
Commit: e9dab1960ac9746fa34eff726b81635147615a79
Parent: a1eb96a2f635cdb8f626f4074dae2ba5a6fce1e8
Author: Luming Yu <[EMAIL PROTECTED]>
AuthorDate: Mon Aug 20 18:23:53 2007 +0800
Committer:  Len Brown <[EMAIL PROTECTED]>
CommitDate: Fri Aug 24 22:23:46 2007 -0400

ACPI video hotkey: export missing ACPI video hotkey events via input layer

Signed-off-by: Yu Luming <[EMAIL PROTECTED]>
Signed-off-by: Zhang Rui <[EMAIL PROTECTED]>
Signed-off-by: Len Brown <[EMAIL PROTECTED]>
---
 drivers/acpi/video.c |   89 +-
 1 files changed, 88 insertions(+), 1 deletions(-)

diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 8efdea5..d727d2c 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -31,7 +31,7 @@
 #include 
 #include 
 #include 
-
+#include 
 #include 
 #include 
 #include 
@@ -138,6 +138,8 @@ struct acpi_video_bus {
struct semaphore sem;
struct list_head video_device_list;
struct proc_dir_entry *dir;
+   struct input_dev *input;
+   char phys[32];  /* for input device */
 };
 
 struct acpi_video_device_flags {
@@ -1764,6 +1766,9 @@ static void acpi_video_bus_notify(acpi_handle handle, u32 
event, void *data)
 {
struct acpi_video_bus *video = data;
struct acpi_device *device = NULL;
+   struct input_dev *input;
+   int keycode;
+
 
printk("video bus notify\n");
 
@@ -1771,11 +1776,13 @@ static void acpi_video_bus_notify(acpi_handle handle, 
u32 event, void *data)
return;
 
device = video->device;
+   input = video->input;
 
switch (event) {
case ACPI_VIDEO_NOTIFY_SWITCH:  /* User requested a switch,
 * most likely via hotkey. */
acpi_bus_generate_event(device, event, 0);
+   keycode = KEY_SWITCHVIDEOMODE;
break;
 
case ACPI_VIDEO_NOTIFY_PROBE:   /* User plugged in or removed a video
@@ -1784,21 +1791,37 @@ static void acpi_video_bus_notify(acpi_handle handle, 
u32 event, void *data)
acpi_video_device_rebind(video);
acpi_video_switch_output(video, event);
acpi_bus_generate_event(device, event, 0);
+   keycode = KEY_SWITCHVIDEOMODE;
break;
 
case ACPI_VIDEO_NOTIFY_CYCLE:   /* Cycle Display output hotkey pressed. 
*/
+   acpi_video_switch_output(video, event);
+   acpi_bus_generate_event(device, event, 0);
+   keycode = KEY_SWITCHVIDEOMODE;
+   break;
case ACPI_VIDEO_NOTIFY_NEXT_OUTPUT: /* Next Display output hotkey 
pressed. */
+   acpi_video_switch_output(video, event);
+   acpi_bus_generate_event(device, event, 0);
+   keycode = KEY_VIDEO_NEXT;
+   break;
case ACPI_VIDEO_NOTIFY_PREV_OUTPUT: /* previous Display output 
hotkey pressed. */
acpi_video_switch_output(video, event);
acpi_bus_generate_event(device, event, 0);
+   keycode = KEY_VIDEO_PREV;
break;
 
default:
+   keycode = KEY_UNKNOWN;
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
  "Unsupported event [0x%x]\n", event));
break;
}
 
+   input_report_key(input, keycode, 1);
+   input_sync(input);
+   input_report_key(input, keycode, 0);
+   input_sync(input);
+
return;
 }
 
@@ -1806,26 +1829,55 @@ static void acpi_video_device_notify(acpi_handle 
handle, u32 event, void *data)
 {
struct acpi_video_device *video_device = data;
struct acpi_device *device = NULL;
+   struct acpi_video_bus *bus;
+   struct input_dev *input;
+   int keycode;
 
if (!video_device)
return;
 
device = video_device->dev;
+   bus = video_device->video;
+   input = bus->input;
 
switch (event) {
case ACPI_VIDEO_NOTIFY_CYCLE_BRIGHTNESS:/* Cycle brightness */
+   acpi_video_switch_brightness(video_device, event);
+   acpi_bus_generate_event(device, event, 0);
+   keycode = KEY_BRIGHTNESS_CYCLE;
+   break;
case ACPI_VIDEO_NOTIFY_INC_BRIGHTNESS:  /* Increase brightness */
+   acpi_video_switch_brightness(video_device, event);
+   acpi_bus_generate_event(device, event, 0);
+   keycode = KEY_BRIGHTNESSUP;
+   break;
case ACPI_VIDEO_NOTIFY_DEC_BRIGHTNESS:  /* Decrease brightness */
+   acpi_video_switch_brightness(video_device, event);
+   acpi_bus_generate_event(device, event, 0);
+   keycode = KEY_BRIGHTNESSDOWN;
+   break;
case ACPI_VIDEO_NOTIFY_ZE

ACPI: enable GPEs before calling _WAK on resume

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=79d2dfaa4e787f94b7f65f4611bc7d1c8d85fabc
Commit: 79d2dfaa4e787f94b7f65f4611bc7d1c8d85fabc
Parent: b377fd3982ad957c796758a90e2988401a884241
Author: Thomas Renninger <[EMAIL PROTECTED]>
AuthorDate: Fri Aug 24 01:24:47 2007 -0400
Committer:  Len Brown <[EMAIL PROTECTED]>
CommitDate: Fri Aug 24 01:24:47 2007 -0400

ACPI: enable GPEs before calling _WAK on resume

It seems it's required to enable GPEs before _WAK.  E.g.  X60 triggers a
LID related GPE instead of doing a Notify in WAK.  Now the GPE reaches the
kernel and the Notify for LID status change gets thrown from there.

Signed-off-by: Thomas Renninger <[EMAIL PROTECTED]>
Acked-by: Rafael J. Wysocki <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Len Brown <[EMAIL PROTECTED]>
---
 drivers/acpi/hardware/hwsleep.c |   19 +++
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c
index 76c525d..cf69c00 100644
--- a/drivers/acpi/hardware/hwsleep.c
+++ b/drivers/acpi/hardware/hwsleep.c
@@ -576,13 +576,10 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state)
ACPI_EXCEPTION((AE_INFO, status, "During Method _BFS"));
}
 
-   status = acpi_evaluate_object(NULL, METHOD_NAME__WAK, &arg_list, NULL);
-   if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
-   ACPI_EXCEPTION((AE_INFO, status, "During Method _WAK"));
-   }
-   /* TBD: _WAK "sometimes" returns stuff - do we want to look at it? */
-
/*
+* GPEs must be enabled before _WAK is called as GPEs
+* might get fired there
+*
 * Restore the GPEs:
 * 1) Disable/Clear all GPEs
 * 2) Enable all runtime GPEs
@@ -591,13 +588,19 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state)
if (ACPI_FAILURE(status)) {
return_ACPI_STATUS(status);
}
-   acpi_gbl_system_awake_and_running = TRUE;
-
status = acpi_hw_enable_all_runtime_gpes();
if (ACPI_FAILURE(status)) {
return_ACPI_STATUS(status);
}
 
+   status = acpi_evaluate_object(NULL, METHOD_NAME__WAK, &arg_list, NULL);
+   if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
+   ACPI_EXCEPTION((AE_INFO, status, "During Method _WAK"));
+   }
+   /* TBD: _WAK "sometimes" returns stuff - do we want to look at it? */
+
+   acpi_gbl_system_awake_and_running = TRUE;
+
/* Enable power button */
 
(void)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

ACPI: "ACPI handle has no context!" should be KERN_DEBUG

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ead77594af3a49e48ceec61a1824362be4b5cafa
Commit: ead77594af3a49e48ceec61a1824362be4b5cafa
Parent: 1a8f46100b657f533ce677e79bc27c6794c91c46
Author: Shaohua Li <[EMAIL PROTECTED]>
AuthorDate: Thu Aug 23 15:01:13 2007 +0800
Committer:  Len Brown <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 01:38:20 2007 -0400

ACPI: "ACPI handle has no context!" should be KERN_DEBUG

Signed-off-by: Shaohua Li <[EMAIL PROTECTED]>
Signed-off-by: Len Brown <[EMAIL PROTECTED]>
---
 drivers/acpi/sleep/main.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index e8cff5d..c52ade8 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -305,7 +305,7 @@ int acpi_pm_device_sleep_state(struct device *dev, int 
wake, int *d_min_p)
unsigned long d_min, d_max;
 
if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &adev))) {
-   printk(KERN_ERR "ACPI handle has no context!\n");
+   printk(KERN_DEBUG "ACPI handle has no context!\n");
return -ENODEV;
}
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

ACPI: Fix a warning of discarding qualifiers from pointer target type

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=70b30fb13bf46d7874537f5e2089bcc772559fc4
Commit: 70b30fb13bf46d7874537f5e2089bcc772559fc4
Parent: ead77594af3a49e48ceec61a1824362be4b5cafa
Author: Al Viro <[EMAIL PROTECTED]>
AuthorDate: Tue Aug 21 16:18:20 2007 +0100
Committer:  Len Brown <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 01:38:40 2007 -0400

ACPI: Fix a warning of discarding qualifiers from pointer target type

drivers/acpi/ec.c: In function `acpi_ec_ecdt_probe':
drivers/acpi/ec.c:873: warning: passing arg 1 of `acpi_get_devices' 
discards qualifiers from pointer target type

Signed-off-by: Al Viro <[EMAIL PROTECTED]>
Signed-off-by: Len Brown <[EMAIL PROTECTED]>
---
 drivers/acpi/namespace/nsxfeval.c |2 +-
 include/acpi/acpixf.h |2 +-
 include/acpi/acstruct.h   |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/acpi/namespace/nsxfeval.c 
b/drivers/acpi/namespace/nsxfeval.c
index ab65b2c..f39fbc6 100644
--- a/drivers/acpi/namespace/nsxfeval.c
+++ b/drivers/acpi/namespace/nsxfeval.c
@@ -540,7 +540,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
  
**/
 
 acpi_status
-acpi_get_devices(char *HID,
+acpi_get_devices(const char *HID,
 acpi_walk_callback user_function,
 void *context, void **return_value)
 {
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index b5cca5d..3d7ab9e 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -130,7 +130,7 @@ acpi_walk_namespace(acpi_object_type type,
void *context, void **return_value);
 
 acpi_status
-acpi_get_devices(char *HID,
+acpi_get_devices(const char *HID,
 acpi_walk_callback user_function,
 void *context, void **return_value);
 
diff --git a/include/acpi/acstruct.h b/include/acpi/acstruct.h
index aeb4498..8848265 100644
--- a/include/acpi/acstruct.h
+++ b/include/acpi/acstruct.h
@@ -146,7 +146,7 @@ struct acpi_init_walk_info {
 struct acpi_get_devices_info {
acpi_walk_callback user_function;
void *context;
-   char *hid;
+   const char *hid;
 };
 
 union acpi_aml_operands {
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

make drivers/acpi/scan.c:create_modalias() static

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=b3e572d2eb7cdbda6f212ad177acd0c9381903b9
Commit: b3e572d2eb7cdbda6f212ad177acd0c9381903b9
Parent: 70b30fb13bf46d7874537f5e2089bcc772559fc4
Author: Adrian Bunk <[EMAIL PROTECTED]>
AuthorDate: Tue Aug 14 23:22:35 2007 +0200
Committer:  Len Brown <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 01:38:51 2007 -0400

make drivers/acpi/scan.c:create_modalias() static

This patch makes the needlessly global create_modalias() static.

Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>
Signed-off-by: Len Brown <[EMAIL PROTECTED]>
---
 drivers/acpi/scan.c |5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index be74347..64620d6 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -35,8 +35,9 @@ struct acpi_device_bus_id{
  * e.g. on a device with hid:IBM0001 and cid:ACPI0001 you get:
  * char *modalias: "acpi:IBM0001:ACPI0001"
 */
-int create_modalias(struct acpi_device *acpi_dev, char *modalias, int size){
-
+static int create_modalias(struct acpi_device *acpi_dev, char *modalias,
+  int size)
+{
int len;
 
if (!acpi_dev->flags.hardware_id)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

ACPI: add dump_stack() to trace acpi_format_exception programming errors

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=3e0d69ecf04d25f1e9c4ad658683d6d92641bb08
Commit: 3e0d69ecf04d25f1e9c4ad658683d6d92641bb08
Parent: b3e572d2eb7cdbda6f212ad177acd0c9381903b9
Author: Andrew Morton <[EMAIL PROTECTED]>
AuthorDate: Sat Aug 25 01:28:20 2007 -0400
Committer:  Len Brown <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 01:39:02 2007 -0400

ACPI: add dump_stack() to trace acpi_format_exception programming errors

Dump the stack so we can find the secretive caller to 
acpi_format_exception().

Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Len Brown <[EMAIL PROTECTED]>
---
 drivers/acpi/utilities/utglobal.c |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/acpi/utilities/utglobal.c 
b/drivers/acpi/utilities/utglobal.c
index 1621655..93ea829 100644
--- a/drivers/acpi/utilities/utglobal.c
+++ b/drivers/acpi/utilities/utglobal.c
@@ -126,6 +126,7 @@ const char *acpi_format_exception(acpi_status status)
"Unknown exception code: 0x%8.8X", status));
 
exception = "UNKNOWN_STATUS_CODE";
+   dump_stack();
}
 
return (ACPI_CAST_PTR(const char, exception));
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

acpiphp_ibm: add missing '\n' to error message

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=5e1f198bbfcffa1e3b9091b4ca7032c2d07fde81
Commit: 5e1f198bbfcffa1e3b9091b4ca7032c2d07fde81
Parent: 3e0d69ecf04d25f1e9c4ad658683d6d92641bb08
Author: Jeremy Fitzhardinge <[EMAIL PROTECTED]>
AuthorDate: Sat Aug 25 01:31:45 2007 -0400
Committer:  Len Brown <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 01:39:13 2007 -0400

acpiphp_ibm: add missing '\n' to error message

Add missing \n to error in ibm_find_acpi_device.

Signed-off-by: Jeremy Fitzhardinge <[EMAIL PROTECTED]>
Cc: Kristen Carlson Accardi <[EMAIL PROTECTED]>
Cc: Greg Kroah-Hartman <[EMAIL PROTECTED]>
Cc: Adrian Bunk <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Len Brown <[EMAIL PROTECTED]>
---
 drivers/pci/hotplug/acpiphp_ibm.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/pci/hotplug/acpiphp_ibm.c 
b/drivers/pci/hotplug/acpiphp_ibm.c
index 70db38c..80544d8 100644
--- a/drivers/pci/hotplug/acpiphp_ibm.c
+++ b/drivers/pci/hotplug/acpiphp_ibm.c
@@ -399,7 +399,7 @@ static acpi_status __init ibm_find_acpi_device(acpi_handle 
handle,
 
status = acpi_get_object_info(handle, &info_buffer);
if (ACPI_FAILURE(status)) {
-   err("%s:  Failed to get device information", __FUNCTION__);
+   err("%s:  Failed to get device information\n", __FUNCTION__);
return 0;
}
info.hardware_id.value[sizeof(info.hardware_id.value) - 1] = '\0';
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

ACPI: Schedule /proc/acpi/event for removal

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=14e04fb34ffa82ee61ae69f98d8fca12d2e8e31c
Commit: 14e04fb34ffa82ee61ae69f98d8fca12d2e8e31c
Parent: 962ce8ca0604af0c3c5609f7613d4ec5fcfac623
Author: Len Brown <[EMAIL PROTECTED]>
AuthorDate: Thu Aug 23 15:20:26 2007 -0400
Committer:  Len Brown <[EMAIL PROTECTED]>
CommitDate: Thu Aug 23 15:20:26 2007 -0400

ACPI: Schedule /proc/acpi/event for removal

Schedule /proc/acpi/event for removal in 6 months.

Re-name acpi_bus_generate_event() to acpi_bus_generate_proc_event()
to make sure there is no confusion that it is for /proc/acpi/event only.

Add CONFIG_ACPI_PROC_EVENT to allow removal of /proc/acpi/event.
There is no functional change if CONFIG_ACPI_PROC_EVENT=y

Signed-off-by: Len Brown <[EMAIL PROTECTED]>
---
 Documentation/feature-removal-schedule.txt |8 
 drivers/acpi/Kconfig   |   14 ++
 drivers/acpi/ac.c  |2 +-
 drivers/acpi/asus_acpi.c   |2 +-
 drivers/acpi/battery.c |2 +-
 drivers/acpi/bus.c |6 --
 drivers/acpi/button.c  |2 +-
 drivers/acpi/event.c   |6 ++
 drivers/acpi/processor_core.c  |6 +++---
 drivers/acpi/sbs.c |2 +-
 drivers/acpi/thermal.c |8 
 drivers/acpi/video.c   |   10 +-
 drivers/char/sonypi.c  |2 +-
 drivers/misc/asus-laptop.c |2 +-
 drivers/misc/sony-laptop.c |4 ++--
 drivers/misc/thinkpad_acpi.c   |8 
 drivers/pci/hotplug/acpiphp_ibm.c  |2 +-
 include/acpi/acpi_bus.h|7 ++-
 18 files changed, 64 insertions(+), 29 deletions(-)

diff --git a/Documentation/feature-removal-schedule.txt 
b/Documentation/feature-removal-schedule.txt
index a43d287..b9a3fdc 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -197,6 +197,14 @@ Who:   Len Brown <[EMAIL PROTECTED]>
 
 ---
 
+What:  /proc/acpi/event
+When:  February 2008
+Why:   /proc/acpi/event has been replaced by events via the input layer
+   and netlink since 2.6.23.
+Who:   Len Brown <[EMAIL PROTECTED]>
+
+---
+
 What:  Compaq touchscreen device emulation
 When:  Oct 2007
 Files: drivers/input/tsdev.c
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index f1372de..5742594 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -68,6 +68,20 @@ config ACPI_PROCFS
 
  Say N to delete /proc/acpi/ files that have moved to /sys/
 
+config ACPI_PROC_EVENT
+   bool "Deprecated /proc/acpi/event support"
+   depends on PROC_FS
+   ---help---
+ A user-space daemon, acpi, typically read /proc/acpi/event
+ and handled all ACPI sub-system generated events.
+
+ These events are now delivered to user-space via
+ either the input layer, or as netlink events.
+
+ This build option enables the old code for for legacy
+ user-space implementation.  After some time, this will
+ be moved under CONFIG_ACPI_PROCFS, and then deleted.
+
 config ACPI_AC
tristate "AC Adapter"
depends on X86
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
index b53c2cf..26d7070 100644
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
@@ -204,7 +204,7 @@ static void acpi_ac_notify(acpi_handle handle, u32 event, 
void *data)
case ACPI_NOTIFY_BUS_CHECK:
case ACPI_NOTIFY_DEVICE_CHECK:
acpi_ac_get_state(ac);
-   acpi_bus_generate_event(device, event, (u32) ac->state);
+   acpi_bus_generate_proc_event(device, event, (u32) ac->state);
acpi_bus_generate_netlink_event(device->pnp.device_class,
  device->dev.bus_id, event,
  (u32) ac->state);
diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c
index 86fd142..d915fec 100644
--- a/drivers/acpi/asus_acpi.c
+++ b/drivers/acpi/asus_acpi.c
@@ -1069,7 +1069,7 @@ static void asus_hotk_notify(acpi_handle handle, u32 
event, void *data)
hotk->brightness = (event & ~((u32) BR_DOWN));
}
 
-   acpi_bus_generate_event(hotk->device, event,
+   acpi_bus_generate_proc_event(hotk->device, event,
hotk->event_count[event % 128]++);
 
return;
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 9f0bf90..91dc4b3 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -867,7 +867,7 @@ static void acpi_battery_notify(acpi_handle handle, u32 
event, void *data)
case ACPI_NOTIFY_DEVICE_CHECK:
 

ACPI: fix ia64 allnoconfig build

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=3e069ee0c30d6f28b79e409ef2df1ffa427897ae
Commit: 3e069ee0c30d6f28b79e409ef2df1ffa427897ae
Parent: 14e04fb34ffa82ee61ae69f98d8fca12d2e8e31c
Author: Len Brown <[EMAIL PROTECTED]>
AuthorDate: Fri Aug 24 03:06:33 2007 -0400
Committer:  Len Brown <[EMAIL PROTECTED]>
CommitDate: Fri Aug 24 03:06:33 2007 -0400

ACPI: fix ia64 allnoconfig build

drivers/acpi/event.c:238: error: conflicting types for 
‘acpi_bus_generate_netlink_event’
include/acpi/acpi_bus.h:324: error: previous declaration of 
‘acpi_bus_generate_netlink_event’ was here

Signed-off-by: Len Brown <[EMAIL PROTECTED]>
---
 drivers/acpi/event.c |5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/acpi/event.c b/drivers/acpi/event.c
index cf6d516..a2b9304 100644
--- a/drivers/acpi/event.c
+++ b/drivers/acpi/event.c
@@ -233,8 +233,9 @@ static int acpi_event_genetlink_init(void)
 }
 
 #else
-int acpi_bus_generate_netlink_event(struct acpi_device *device, u8 type,
- int data)
+int acpi_bus_generate_netlink_event(const char *device_class,
+ const char *bus_id,
+ u8 type, int data)
 {
return 0;
 }
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

ACPI: work around duplicate name "VID" problem on T61

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e6d9da1de0f31c57cfe3837b1b4e51c6d96fcd3c
Commit: e6d9da1de0f31c57cfe3837b1b4e51c6d96fcd3c
Parent: 1a8f46100b657f533ce677e79bc27c6794c91c46
Author: Zhang Rui <[EMAIL PROTECTED]>
AuthorDate: Sat Aug 25 02:23:31 2007 -0400
Committer:  Len Brown <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 02:23:31 2007 -0400

ACPI: work around duplicate name "VID" problem on T61

This can only fix the problem that more than one video bus device
have the same AML name "VID".
ie. the proc I/F for the second "VID" video bus device is located under
/proc/acpi/video/VID1/...

As this is really rare and the ACPI proc I/F is a legacy feature that
we are planning to remove.
We won't provide a generic solution for this problem.

Signed-off-by: Zhang Rui <[EMAIL PROTECTED]>
Signed-off-by: Len Brown <[EMAIL PROTECTED]>
---
 drivers/acpi/video.c |8 
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index d987019..ac63be4 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -1833,6 +1833,7 @@ static void acpi_video_device_notify(acpi_handle handle, 
u32 event, void *data)
return;
 }
 
+static int instance;
 static int acpi_video_bus_add(struct acpi_device *device)
 {
int result = 0;
@@ -1847,6 +1848,13 @@ static int acpi_video_bus_add(struct acpi_device *device)
if (!video)
return -ENOMEM;
 
+   /* a hack to fix the duplicate name "VID" problem on T61 */
+   if (!strcmp(device->pnp.bus_id, "VID")) {
+   if (instance)
+   device->pnp.bus_id[3] = '0' + instance;
+   instance ++;
+   }
+
video->device = device;
strcpy(acpi_device_name(device), ACPI_VIDEO_BUS_NAME);
strcpy(acpi_device_class(device), ACPI_VIDEO_CLASS);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

fix realtek phy id in forcedeth

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ba685fb2abd71162bea6895a99449c1071b01402
Commit: ba685fb2abd71162bea6895a99449c1071b01402
Parent: 1a8f46100b657f533ce677e79bc27c6794c91c46
Author: Willy Tarreau <[EMAIL PROTECTED]>
AuthorDate: Thu Aug 23 21:35:41 2007 +0200
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 02:30:57 2007 -0400

fix realtek phy id in forcedeth

As noticed by Chuck Ebbert, commit c5e3ae8823693b260ce1f217adca8add1bc0b3de
introduced a copy-paste typo, as realtek phy is 0x732 and not 0x1c1. Obvious
fix below suggested by Ayaz Abdulla.

Signed-off-by: Willy Tarreau <[EMAIL PROTECTED]>
Cc: Ayaz Abdulla <[EMAIL PROTECTED]>
Cc: Chuck Ebbert <[EMAIL PROTECTED]>
Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 drivers/net/forcedeth.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 10f4e3b..1938d6d 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -552,7 +552,7 @@ union ring_type {
 #define PHY_OUI_MARVELL0x5043
 #define PHY_OUI_CICADA 0x03f1
 #define PHY_OUI_VITESSE0x01c1
-#define PHY_OUI_REALTEK0x01c1
+#define PHY_OUI_REALTEK0x0732
 #define PHYID1_OUI_MASK0x03ff
 #define PHYID1_OUI_SHFT6
 #define PHYID2_OUI_MASK0xfc00
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Don't use GFP_DMA for zone allocation.

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=09e06f652d86d358583df0b601c0c4d11923dd88
Commit: 09e06f652d86d358583df0b601c0c4d11923dd88
Parent: ba685fb2abd71162bea6895a99449c1071b01402
Author: Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Wed Aug 15 12:53:16 2007 +0100
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 02:30:59 2007 -0400

Don't use GFP_DMA for zone allocation.

IP32 doesn't even have a ZONE_DMA so no point in using GFP_DMA in any
IP32-specific device driver.

Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 drivers/net/meth.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/meth.c b/drivers/net/meth.c
index 92b403b..32bed6b 100644
--- a/drivers/net/meth.c
+++ b/drivers/net/meth.c
@@ -405,7 +405,7 @@ static void meth_rx(struct net_device* dev, unsigned long 
int_status)
priv->stats.rx_length_errors++;
skb = priv->rx_skbs[priv->rx_write];
} else {
-   skb = alloc_skb(METH_RX_BUFF_SIZE, GFP_ATOMIC | 
GFP_DMA);
+   skb = alloc_skb(METH_RX_BUFF_SIZE, GFP_ATOMIC);
if (!skb) {
/* Ouch! No memory! Drop packet on the 
floor */
DPRINTK("No mem: dropping packet\n");
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

phy layer: fix genphy_setup_forced (don't reset)

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=bc1e0a095e9b8c4df4a2eedd7dc6a9d470a0e6b7
Commit: bc1e0a095e9b8c4df4a2eedd7dc6a9d470a0e6b7
Parent: 09e06f652d86d358583df0b601c0c4d11923dd88
Author: Domen Puncer <[EMAIL PROTECTED]>
AuthorDate: Fri Aug 17 08:54:45 2007 +0200
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 02:31:02 2007 -0400

phy layer: fix genphy_setup_forced (don't reset)

Writing BMCR_RESET bit will reset MII_BMCR to default values. This is
clearly not what we want.

Signed-off-by: Domen Puncer <[EMAIL PROTECTED]>
Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 drivers/net/phy/phy_device.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index a8b74cd..e275df8 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -364,7 +364,7 @@ EXPORT_SYMBOL(genphy_config_advert);
  */
 int genphy_setup_forced(struct phy_device *phydev)
 {
-   int ctl = BMCR_RESET;
+   int ctl = 0;
 
phydev->pause = phydev->asym_pause = 0;
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

DM9000: fix interface hang under load

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c46ac9463fbdee41723dd9fd108b2c1ffd30615f
Commit: c46ac9463fbdee41723dd9fd108b2c1ffd30615f
Parent: bc1e0a095e9b8c4df4a2eedd7dc6a9d470a0e6b7
Author: Florian Westphal <[EMAIL PROTECTED]>
AuthorDate: Tue Aug 21 01:33:42 2007 +0200
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 02:31:04 2007 -0400

DM9000: fix interface hang under load

When transferring data at full speed, the DM9000 network interface
sometimes stops sending/receiving data. Worse, ksoftirqd consumes
100% cpu and the net tx watchdog never triggers.
Fix by spin_lock_irqsave() in dm9000_start_xmit() to prevent the
interrupt handler from interfering.

Signed-off-by: Florian Westphal <[EMAIL PROTECTED]>
Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 drivers/net/dm9000.c |   25 +++--
 1 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index c3de81b..738aa59 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -700,6 +700,7 @@ dm9000_init_dm9000(struct net_device *dev)
 static int
 dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
+   unsigned long flags;
board_info_t *db = (board_info_t *) dev->priv;
 
PRINTK3("dm9000_start_xmit\n");
@@ -707,10 +708,7 @@ dm9000_start_xmit(struct sk_buff *skb, struct net_device 
*dev)
if (db->tx_pkt_cnt > 1)
return 1;
 
-   netif_stop_queue(dev);
-
-   /* Disable all interrupts */
-   iow(db, DM9000_IMR, IMR_PAR);
+   spin_lock_irqsave(&db->lock, flags);
 
/* Move data to DM9000 TX RAM */
writeb(DM9000_MWCMD, db->io_addr);
@@ -718,12 +716,9 @@ dm9000_start_xmit(struct sk_buff *skb, struct net_device 
*dev)
(db->outblk)(db->io_data, skb->data, skb->len);
db->stats.tx_bytes += skb->len;
 
+   db->tx_pkt_cnt++;
/* TX control: First packet immediately send, second packet queue */
-   if (db->tx_pkt_cnt == 0) {
-
-   /* First Packet */
-   db->tx_pkt_cnt++;
-
+   if (db->tx_pkt_cnt == 1) {
/* Set TX length to DM9000 */
iow(db, DM9000_TXPLL, skb->len & 0xff);
iow(db, DM9000_TXPLH, (skb->len >> 8) & 0xff);
@@ -732,23 +727,17 @@ dm9000_start_xmit(struct sk_buff *skb, struct net_device 
*dev)
iow(db, DM9000_TCR, TCR_TXREQ); /* Cleared after TX complete */
 
dev->trans_start = jiffies; /* save the time stamp */
-
} else {
/* Second packet */
-   db->tx_pkt_cnt++;
db->queue_pkt_len = skb->len;
+   netif_stop_queue(dev);
}
 
+   spin_unlock_irqrestore(&db->lock, flags);
+
/* free this SKB */
dev_kfree_skb(skb);
 
-   /* Re-enable resource check */
-   if (db->tx_pkt_cnt == 1)
-   netif_wake_queue(dev);
-
-   /* Re-enable interrupt */
-   iow(db, DM9000_IMR, IMR_PAR | IMR_PTM | IMR_PRM);
-
return 0;
 }
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

sky2: clear PCI power control reg at startup

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=b23457737f073eaf5a7b797c2a195f83633e003d
Commit: b23457737f073eaf5a7b797c2a195f83633e003d
Parent: c46ac9463fbdee41723dd9fd108b2c1ffd30615f
Author: Stephen Hemminger <[EMAIL PROTECTED]>
AuthorDate: Tue Aug 21 14:34:02 2007 -0700
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 02:31:06 2007 -0400

sky2: clear PCI power control reg at startup

Make sure PCI register for PHY power gets cleared on boot, and make
sure to avoid any PCI posting problems.

Signed-off-by: Stephen Hemminger <[EMAIL PROTECTED]>
Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 drivers/net/sky2.c |7 ++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 7575924..33ba348 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -219,9 +219,12 @@ static void sky2_power_on(struct sky2_hw *hw)
else
sky2_write8(hw, B2_Y2_CLK_GATE, 0);
 
-   if (hw->chip_id == CHIP_ID_YUKON_EC_U || hw->chip_id == 
CHIP_ID_YUKON_EX) {
+   if (hw->chip_id == CHIP_ID_YUKON_EC_U ||
+   hw->chip_id == CHIP_ID_YUKON_EX) {
u32 reg;
 
+   sky2_pci_write32(hw, PCI_DEV_REG3, 0);
+
reg = sky2_pci_read32(hw, PCI_DEV_REG4);
/* set all bits to 0 except bits 15..12 and 8 */
reg &= P_ASPM_CONTROL_MSK;
@@ -238,6 +241,8 @@ static void sky2_power_on(struct sky2_hw *hw)
reg = sky2_read32(hw, B2_GP_IO);
reg |= GLB_GPIO_STAT_RACE_DIS;
sky2_write32(hw, B2_GP_IO, reg);
+
+   sky2_read32(hw, B2_GP_IO);
}
 }
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

sky2: only bring up watchdog if link is active

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=32c2c30085324aef9699934295281cca0161ef7e
Commit: 32c2c30085324aef9699934295281cca0161ef7e
Parent: b23457737f073eaf5a7b797c2a195f83633e003d
Author: Stephen Hemminger <[EMAIL PROTECTED]>
AuthorDate: Tue Aug 21 14:34:03 2007 -0700
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 02:31:08 2007 -0400

sky2: only bring up watchdog if link is active

This fixes the extra timer overhead that people were whining about
as a 2.6.23 regression.

Running the watchdog timer all the time is unneeded. Change it
to run only if link is up, and reduce frequency to save power.

Signed-off-by: Stephen Hemminger <[EMAIL PROTECTED]>
Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 drivers/net/sky2.c |   55 +++
 drivers/net/sky2.h |3 +-
 2 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 33ba348..00c5f05 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -99,10 +99,6 @@ static int disable_msi = 0;
 module_param(disable_msi, int, 0);
 MODULE_PARM_DESC(disable_msi, "Disable Message Signaled Interrupt (MSI)");
 
-static int idle_timeout = 100;
-module_param(idle_timeout, int, 0);
-MODULE_PARM_DESC(idle_timeout, "Watchdog timer for lost interrupts (ms)");
-
 static const struct pci_device_id sky2_id_table[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9000) }, /* SK-9Sxx */
{ PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9E00) }, /* SK-9Exx */
@@ -1624,6 +1620,9 @@ static int sky2_down(struct net_device *dev)
if (netif_msg_ifdown(sky2))
printk(KERN_INFO PFX "%s: disabling interface\n", dev->name);
 
+   if (netif_carrier_ok(dev) && --hw->active == 0)
+   del_timer(&hw->watchdog_timer);
+
/* Stop more packets from being queued */
netif_stop_queue(dev);
 
@@ -1744,6 +1743,10 @@ static void sky2_link_up(struct sky2_port *sky2)
 
netif_carrier_on(sky2->netdev);
 
+   if (hw->active++ == 0)
+   mod_timer(&hw->watchdog_timer, jiffies + 1);
+
+
/* Turn on link LED */
sky2_write8(hw, SK_REG(port, LNK_LED_REG),
LINKLED_ON | LINKLED_BLINK_OFF | LINKLED_LINKSYNC_OFF);
@@ -1795,6 +1798,11 @@ static void sky2_link_down(struct sky2_port *sky2)
 
netif_carrier_off(sky2->netdev);
 
+   /* Stop watchdog if both ports are not active */
+   if (--hw->active == 0)
+   del_timer(&hw->watchdog_timer);
+
+
/* Turn on link LED */
sky2_write8(hw, SK_REG(port, LNK_LED_REG), LINKLED_OFF);
 
@@ -2426,25 +2434,20 @@ static void sky2_le_error(struct sky2_hw *hw, unsigned 
port,
sky2_write32(hw, Q_ADDR(q, Q_CSR), BMU_CLR_IRQ_CHK);
 }
 
-/* If idle then force a fake soft NAPI poll once a second
- * to work around cases where sharing an edge triggered interrupt.
- */
-static inline void sky2_idle_start(struct sky2_hw *hw)
-{
-   if (idle_timeout > 0)
-   mod_timer(&hw->idle_timer,
- jiffies + msecs_to_jiffies(idle_timeout));
-}
-
-static void sky2_idle(unsigned long arg)
+/* Check for lost IRQ once a second */
+static void sky2_watchdog(unsigned long arg)
 {
struct sky2_hw *hw = (struct sky2_hw *) arg;
-   struct net_device *dev = hw->dev[0];
 
-   if (__netif_rx_schedule_prep(dev))
-   __netif_rx_schedule(dev);
+   if (sky2_read32(hw, B0_ISRC)) {
+   struct net_device *dev = hw->dev[0];
+
+   if (__netif_rx_schedule_prep(dev))
+   __netif_rx_schedule(dev);
+   }
 
-   mod_timer(&hw->idle_timer, jiffies + msecs_to_jiffies(idle_timeout));
+   if (hw->active > 0)
+   mod_timer(&hw->watchdog_timer, round_jiffies(jiffies + HZ));
 }
 
 /* Hardware/software error handling */
@@ -2732,8 +2735,6 @@ static void sky2_restart(struct work_struct *work)
struct net_device *dev;
int i, err;
 
-   del_timer_sync(&hw->idle_timer);
-
rtnl_lock();
sky2_write32(hw, B0_IMSK, 0);
sky2_read32(hw, B0_IMSK);
@@ -2762,8 +2763,6 @@ static void sky2_restart(struct work_struct *work)
}
}
 
-   sky2_idle_start(hw);
-
rtnl_unlock();
 }
 
@@ -4030,11 +4029,9 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
sky2_show_addr(dev1);
}
 
-   setup_timer(&hw->idle_timer, sky2_idle, (unsigned long) hw);
+   setup_timer(&hw->watchdog_timer, sky2_watchdog, (unsigned long) hw);
INIT_WORK(&hw->restart_work, sky2_restart);
 
-   sky2_idle_start(hw);
-
pci_set_drvdata(pdev, hw);
 
return 0;
@@ -4069,7 +4066,7 @@ static void __devexit sky2_remove(struct pci_dev *pdev)
if (!hw)
return;
 
-   del_timer_sync(&hw->idle_timer);
+   del_time

sky2 1.17

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c2cb71fafb4d514fbb8c9a8d663486a8f0400afa
Commit: c2cb71fafb4d514fbb8c9a8d663486a8f0400afa
Parent: 32c2c30085324aef9699934295281cca0161ef7e
Author: Stephen Hemminger <[EMAIL PROTECTED]>
AuthorDate: Tue Aug 21 14:34:04 2007 -0700
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 02:31:11 2007 -0400

sky2 1.17

Mark new version to track if current driver is in use.

Signed-off-by: Stephen Hemminger <[EMAIL PROTECTED]>
Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 drivers/net/sky2.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 00c5f05..e6d937e 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -51,7 +51,7 @@
 #include "sky2.h"
 
 #define DRV_NAME   "sky2"
-#define DRV_VERSION"1.16"
+#define DRV_VERSION"1.17"
 #define PFXDRV_NAME " "
 
 /*
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

sgiseeq: Fix return type of sgiseeq_remove

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e3efb05468128e834cf17d492822333c6e189ae4
Commit: e3efb05468128e834cf17d492822333c6e189ae4
Parent: c2cb71fafb4d514fbb8c9a8d663486a8f0400afa
Author: Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Wed Aug 22 16:03:52 2007 +0100
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 02:31:13 2007 -0400

sgiseeq: Fix return type of sgiseeq_remove

The driver remove method needs to return an int not void.  This was just
never noticed because usually this driver is not being built as a module.

Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 drivers/net/sgiseeq.c |4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/net/sgiseeq.c b/drivers/net/sgiseeq.c
index 384b468..0fb74cb 100644
--- a/drivers/net/sgiseeq.c
+++ b/drivers/net/sgiseeq.c
@@ -726,7 +726,7 @@ err_out:
return err;
 }
 
-static void __exit sgiseeq_remove(struct platform_device *pdev)
+static int __exit sgiseeq_remove(struct platform_device *pdev)
 {
struct net_device *dev = platform_get_drvdata(pdev);
struct sgiseeq_private *sp = netdev_priv(dev);
@@ -735,6 +735,8 @@ static void __exit sgiseeq_remove(struct platform_device 
*pdev)
free_page((unsigned long) sp->srings);
free_netdev(dev);
platform_set_drvdata(pdev, NULL);
+
+   return 0;
 }
 
 static struct platform_driver sgiseeq_driver = {
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

ehea: fix interface to DLPAR tools

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a8e34fda798861d0f3f12c2739c1bec258be8bed
Commit: a8e34fda798861d0f3f12c2739c1bec258be8bed
Parent: e3efb05468128e834cf17d492822333c6e189ae4
Author: Jan-Bernd Themann <[EMAIL PROTECTED]>
AuthorDate: Wed Aug 22 16:20:58 2007 +0200
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 02:31:15 2007 -0400

ehea: fix interface to DLPAR tools

Userspace DLPAR tool expects decimal numbers to be written to
and read from sysfs entries.

Signed-off-by: Jan-Bernd Themann <[EMAIL PROTECTED]>
Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 drivers/net/ehea/ehea_main.c |6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index 9756211..22d000f 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -2490,7 +2490,7 @@ static ssize_t ehea_show_port_id(struct device *dev,
 struct device_attribute *attr, char *buf)
 {
struct ehea_port *port = container_of(dev, struct ehea_port, ofdev.dev);
-   return sprintf(buf, "0x%X", port->logical_port_id);
+   return sprintf(buf, "%d", port->logical_port_id);
 }
 
 static DEVICE_ATTR(log_port_id, S_IRUSR | S_IRGRP | S_IROTH, ehea_show_port_id,
@@ -2781,7 +2781,7 @@ static ssize_t ehea_probe_port(struct device *dev,
 
u32 logical_port_id;
 
-   sscanf(buf, "%X", &logical_port_id);
+   sscanf(buf, "%d", &logical_port_id);
 
port = ehea_get_port(adapter, logical_port_id);
 
@@ -2834,7 +2834,7 @@ static ssize_t ehea_remove_port(struct device *dev,
int i;
u32 logical_port_id;
 
-   sscanf(buf, "%X", &logical_port_id);
+   sscanf(buf, "%d", &logical_port_id);
 
port = ehea_get_port(adapter, logical_port_id);
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

ehea: fix module parameter description

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=18072a5bf7211d6899a2edc90c291c5c6fbc83d2
Commit: 18072a5bf7211d6899a2edc90c291c5c6fbc83d2
Parent: a8e34fda798861d0f3f12c2739c1bec258be8bed
Author: Jan-Bernd Themann <[EMAIL PROTECTED]>
AuthorDate: Wed Aug 22 16:21:24 2007 +0200
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 02:31:18 2007 -0400

ehea: fix module parameter description

Update the module parameter description of "use_mcs" to
show correct default value

Signed-off-by: Jan-Bernd Themann <[EMAIL PROTECTED]>
Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 drivers/net/ehea/ehea_main.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index 22d000f..db57474 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -76,7 +76,7 @@ MODULE_PARM_DESC(rq1_entries, "Number of entries for Receive 
Queue 1 "
 MODULE_PARM_DESC(sq_entries, " Number of entries for the Send Queue  "
 "[2^x - 1], x = [6..14]. Default = "
 __MODULE_STRING(EHEA_DEF_ENTRIES_SQ) ")");
-MODULE_PARM_DESC(use_mcs, " 0:NAPI, 1:Multiple receive queues, Default = 1 ");
+MODULE_PARM_DESC(use_mcs, " 0:NAPI, 1:Multiple receive queues, Default = 0 ");
 
 static int port_name_cnt = 0;
 static LIST_HEAD(adapter_list);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

ehea: fix queue destructor

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=28721c890c9b71cfee45e835bda4639777862e2f
Commit: 28721c890c9b71cfee45e835bda4639777862e2f
Parent: 18072a5bf7211d6899a2edc90c291c5c6fbc83d2
Author: Jan-Bernd Themann <[EMAIL PROTECTED]>
AuthorDate: Wed Aug 22 16:21:28 2007 +0200
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 02:31:20 2007 -0400

ehea: fix queue destructor

Includes hcp_epas_dtor in eq/cq/qp destructors to unmap
HW register.

Signed-off-by: Jan-Bernd Themann <[EMAIL PROTECTED]>
Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 drivers/net/ehea/ehea_qmr.c |6 ++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/drivers/net/ehea/ehea_qmr.c b/drivers/net/ehea/ehea_qmr.c
index a36fa6c..c82e245 100644
--- a/drivers/net/ehea/ehea_qmr.c
+++ b/drivers/net/ehea/ehea_qmr.c
@@ -235,6 +235,8 @@ int ehea_destroy_cq(struct ehea_cq *cq)
if (!cq)
return 0;
 
+   hcp_epas_dtor(&cq->epas);
+
if ((hret = ehea_destroy_cq_res(cq, NORMAL_FREE)) == H_R_STATE) {
ehea_error_data(cq->adapter, cq->fw_handle);
hret = ehea_destroy_cq_res(cq, FORCE_FREE);
@@ -361,6 +363,8 @@ int ehea_destroy_eq(struct ehea_eq *eq)
if (!eq)
return 0;
 
+   hcp_epas_dtor(&eq->epas);
+
if ((hret = ehea_destroy_eq_res(eq, NORMAL_FREE)) == H_R_STATE) {
ehea_error_data(eq->adapter, eq->fw_handle);
hret = ehea_destroy_eq_res(eq, FORCE_FREE);
@@ -541,6 +545,8 @@ int ehea_destroy_qp(struct ehea_qp *qp)
if (!qp)
return 0;
 
+   hcp_epas_dtor(&qp->epas);
+
if ((hret = ehea_destroy_qp_res(qp, NORMAL_FREE)) == H_R_STATE) {
ehea_error_data(qp->adapter, qp->fw_handle);
hret = ehea_destroy_qp_res(qp, FORCE_FREE);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

myri10ge: use pcie_get/set_readrq

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=302d242cfb64eb53fb6d2aa2ae68ddd1ab47079f
Commit: 302d242cfb64eb53fb6d2aa2ae68ddd1ab47079f
Parent: 28721c890c9b71cfee45e835bda4639777862e2f
Author: Brice Goglin <[EMAIL PROTECTED]>
AuthorDate: Fri Aug 24 08:57:17 2007 +0200
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 02:31:22 2007 -0400

myri10ge: use pcie_get/set_readrq

Based on a patch from Peter Oruba, convert myri10ge to use pcie_get_readrq()
and pcie_set_readrq() instead of our own PCI calls and arithmetics.

These driver changes incorporate the proposed PCI-X / PCI-Express read byte
count interface.  Reading and setting those values doesn't take place
"manually", instead wrapping functions are called to allow quirks for some
PCI bridges.

Signed-off-by: Brice Goglin <[EMAIL PROTECTED]>
Signed-off by: Peter Oruba <[EMAIL PROTECTED]>
Based on work by Stephen Hemminger <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 drivers/net/myri10ge/myri10ge.c |   32 ++--
 1 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index ae9bb7b..3f9fb34 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -2514,26 +2514,20 @@ static void myri10ge_firmware_probe(struct 
myri10ge_priv *mgp)
 {
struct pci_dev *pdev = mgp->pdev;
struct device *dev = &pdev->dev;
-   int cap, status;
-   u16 val;
+   int status;
 
mgp->tx.boundary = 4096;
/*
 * Verify the max read request size was set to 4KB
 * before trying the test with 4KB.
 */
-   cap = pci_find_capability(pdev, PCI_CAP_ID_EXP);
-   if (cap < 64) {
-   dev_err(dev, "Bad PCI_CAP_ID_EXP location %d\n", cap);
-   goto abort;
-   }
-   status = pci_read_config_word(pdev, cap + PCI_EXP_DEVCTL, &val);
-   if (status != 0) {
+   status = pcie_get_readrq(pdev);
+   if (status < 0) {
dev_err(dev, "Couldn't read max read req size: %d\n", status);
goto abort;
}
-   if ((val & (5 << 12)) != (5 << 12)) {
-   dev_warn(dev, "Max Read Request size != 4096 (0x%x)\n", val);
+   if (status != 4096) {
+   dev_warn(dev, "Max Read Request size != 4096 (%d)\n", status);
mgp->tx.boundary = 2048;
}
/*
@@ -2850,9 +2844,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const 
struct pci_device_id *ent)
size_t bytes;
int i;
int status = -ENXIO;
-   int cap;
int dac_enabled;
-   u16 val;
 
netdev = alloc_etherdev(sizeof(*mgp));
if (netdev == NULL) {
@@ -2884,19 +2876,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const 
struct pci_device_id *ent)
= pci_find_capability(pdev, PCI_CAP_ID_VNDR);
 
/* Set our max read request to 4KB */
-   cap = pci_find_capability(pdev, PCI_CAP_ID_EXP);
-   if (cap < 64) {
-   dev_err(&pdev->dev, "Bad PCI_CAP_ID_EXP location %d\n", cap);
-   goto abort_with_netdev;
-   }
-   status = pci_read_config_word(pdev, cap + PCI_EXP_DEVCTL, &val);
-   if (status != 0) {
-   dev_err(&pdev->dev, "Error %d reading PCI_EXP_DEVCTL\n",
-   status);
-   goto abort_with_netdev;
-   }
-   val = (val & ~PCI_EXP_DEVCTL_READRQ) | (5 << 12);
-   status = pci_write_config_word(pdev, cap + PCI_EXP_DEVCTL, val);
+   status = pcie_set_readrq(pdev, 4096);
if (status != 0) {
dev_err(&pdev->dev, "Error %d writing PCI_EXP_DEVCTL\n",
status);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

myri10ge: update driver version to 1.3.2-1.269

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=2972863768cc2ef94734abb22dec6a46b0891307
Commit: 2972863768cc2ef94734abb22dec6a46b0891307
Parent: 302d242cfb64eb53fb6d2aa2ae68ddd1ab47079f
Author: Brice Goglin <[EMAIL PROTECTED]>
AuthorDate: Fri Aug 24 08:57:54 2007 +0200
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 02:31:25 2007 -0400

myri10ge: update driver version to 1.3.2-1.269

Update myri10ge driver version to 1.3.2-1.269.

Signed-off-by: Brice Goglin <[EMAIL PROTECTED]>
Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 drivers/net/myri10ge/myri10ge.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 3f9fb34..1c42266 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -72,7 +72,7 @@
 #include "myri10ge_mcp.h"
 #include "myri10ge_mcp_gen_header.h"
 
-#define MYRI10GE_VERSION_STR "1.3.1-1.248"
+#define MYRI10GE_VERSION_STR "1.3.2-1.269"
 
 MODULE_DESCRIPTION("Myricom 10G driver (10GbE)");
 MODULE_AUTHOR("Maintainer: [EMAIL PROTECTED]");
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

drm_rmmap_ioctl(): remove dead code

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7ea4d4bd5e21380f028c3a6e2500655090a3f932
Commit: 7ea4d4bd5e21380f028c3a6e2500655090a3f932
Parent: f695baf2df9e0413d3521661070103711545207a
Author: Adrian Bunk <[EMAIL PROTECTED]>
AuthorDate: Mon Jul 23 10:00:51 2007 +0200
Committer:  Dave Airlie <[EMAIL PROTECTED]>
CommitDate: Mon Jul 23 18:29:41 2007 +1000

drm_rmmap_ioctl(): remove dead code

This patch removes some obviously dead code spotted by the Coverity
checker.

Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>
Signed-off-by: Dave Airlie <[EMAIL PROTECTED]>
---
 drivers/char/drm/drm_bufs.c |5 -
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/drivers/char/drm/drm_bufs.c b/drivers/char/drm/drm_bufs.c
index 923174c..3d1ec82 100644
--- a/drivers/char/drm/drm_bufs.c
+++ b/drivers/char/drm/drm_bufs.c
@@ -479,11 +479,6 @@ int drm_rmmap_ioctl(struct inode *inode, struct file *filp,
return -EINVAL;
}
 
-   if (!map) {
-   mutex_unlock(&dev->struct_mutex);
-   return -EINVAL;
-   }
-
/* Register and framebuffer maps are permanent */
if ((map->type == _DRM_REGISTERS) || (map->type == _DRM_FRAME_BUFFER)) {
mutex_unlock(&dev->struct_mutex);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

drm/via: Fix dmablit when blit queue is full

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=22c806c23fe17f9c744d19edfe650cfd6496bc2a
Commit: 22c806c23fe17f9c744d19edfe650cfd6496bc2a
Parent: 7ea4d4bd5e21380f028c3a6e2500655090a3f932
Author: Simon Farnsworth <[EMAIL PROTECTED]>
AuthorDate: Mon Jul 23 18:32:01 2007 +1000
Committer:  Dave Airlie <[EMAIL PROTECTED]>
CommitDate: Mon Jul 23 18:32:01 2007 +1000

drm/via: Fix dmablit when blit queue is full

fd.o bug 11542

Acked-by: Thomas Hellstrom
Signed-off-by: Dave Airlie <[EMAIL PROTECTED]>
---
 drivers/char/drm/via_dmablit.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/char/drm/via_dmablit.c b/drivers/char/drm/via_dmablit.c
index 832de1d..3dd1ed3 100644
--- a/drivers/char/drm/via_dmablit.c
+++ b/drivers/char/drm/via_dmablit.c
@@ -560,7 +560,7 @@ via_init_dmablit(struct drm_device *dev)
blitq->head = 0;
blitq->cur = 0;
blitq->serviced = 0;
-   blitq->num_free = VIA_NUM_BLIT_SLOTS;
+   blitq->num_free = VIA_NUM_BLIT_SLOTS - 1;
blitq->num_outstanding = 0;
blitq->is_active = 0;
blitq->aborting = 0;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

drm: ioremap return value checks

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=0769d39c993145754852b517ddd9c11586f0a014
Commit: 0769d39c993145754852b517ddd9c11586f0a014
Parent: 22c806c23fe17f9c744d19edfe650cfd6496bc2a
Author: Scott Thompson 
AuthorDate: Sat Aug 25 18:17:49 2007 +1000
Committer:  Dave Airlie <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 18:17:49 2007 +1000

drm: ioremap return value checks

Signed-off-by: Scott Thompson  hushmail.com>
Signed-off-by: Dave Airlie <[EMAIL PROTECTED]>
---
 drivers/char/drm/drm_bufs.c |8 +++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/drivers/char/drm/drm_bufs.c b/drivers/char/drm/drm_bufs.c
index 3d1ec82..c115b39 100644
--- a/drivers/char/drm/drm_bufs.c
+++ b/drivers/char/drm/drm_bufs.c
@@ -177,8 +177,14 @@ static int drm_addmap_core(struct drm_device * dev, 
unsigned int offset,
 MTRR_TYPE_WRCOMB, 1);
}
}
-   if (map->type == _DRM_REGISTERS)
+   if (map->type == _DRM_REGISTERS) {
map->handle = ioremap(map->offset, map->size);
+   if (!map->handle) {
+   drm_free(map, sizeof(*map), DRM_MEM_MAPS);
+   return -ENOMEM;
+   }
+   }
+   
break;
case _DRM_SHM:
list = drm_find_matching_map(dev, map);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

efficeon-agp leaks 'struct agp_bridge_data' in error paths of agp_efficeon_probe()

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=db7f3ded8d42c60b0d0a4f71d621e105790b872b
Commit: db7f3ded8d42c60b0d0a4f71d621e105790b872b
Parent: d4ac2477fad0f2680e84ec12e387ce67682c5c13
Author: Jesper Juhl <[EMAIL PROTECTED]>
AuthorDate: Sat Aug 4 20:30:58 2007 +0200
Committer:  Dave Airlie <[EMAIL PROTECTED]>
CommitDate: Mon Aug 6 07:30:20 2007 +1000

efficeon-agp leaks 'struct agp_bridge_data' in error paths of 
agp_efficeon_probe()

(This is a resend of a patch originally submitted on 24-Jul-2007 00:14)

Ok, this is something the coverity checker found (CID: 1813).
I'm not at all intimate with this code, so I'm not sure if this
attempt at a fix is correct (but at least it compiles).

Please look it over and NACK if bad or merge if good ;-)

Signed-off-by: Jesper Juhl <[EMAIL PROTECTED]>
Signed-off-by: Dave Airlie <[EMAIL PROTECTED]>
---
 drivers/char/agp/efficeon-agp.c |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/char/agp/efficeon-agp.c b/drivers/char/agp/efficeon-agp.c
index df8da72..d78cd09 100644
--- a/drivers/char/agp/efficeon-agp.c
+++ b/drivers/char/agp/efficeon-agp.c
@@ -375,6 +375,7 @@ static int __devinit agp_efficeon_probe(struct pci_dev 
*pdev,
if (!r->start && r->end) {
if (pci_assign_resource(pdev, 0)) {
printk(KERN_ERR PFX "could not assign resource 0\n");
+   agp_put_bridge(bridge);
return -ENODEV;
}
}
@@ -386,6 +387,7 @@ static int __devinit agp_efficeon_probe(struct pci_dev 
*pdev,
*/
if (pci_enable_device(pdev)) {
printk(KERN_ERR PFX "Unable to Enable PCI device\n");
+   agp_put_bridge(bridge);
return -ENODEV;
}
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

agp: Add device id for P4M900 to via-agp module

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=32ddef98f232585f20bc8bdb891029a6a5f633d0
Commit: 32ddef98f232585f20bc8bdb891029a6a5f633d0
Parent: db7f3ded8d42c60b0d0a4f71d621e105790b872b
Author: Xavier Bachelot <[EMAIL PROTECTED]>
AuthorDate: Sat Aug 25 18:10:52 2007 +1000
Committer:  Dave Airlie <[EMAIL PROTECTED](none)>
CommitDate: Sat Aug 25 18:10:52 2007 +1000

agp: Add device id for P4M900 to via-agp module

Signed-off-by: Dave Airlie <[EMAIL PROTECTED]>
---
 drivers/char/agp/via-agp.c |5 +
 include/linux/pci_ids.h|1 +
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/drivers/char/agp/via-agp.c b/drivers/char/agp/via-agp.c
index 9aaf401..0ecc54d 100644
--- a/drivers/char/agp/via-agp.c
+++ b/drivers/char/agp/via-agp.c
@@ -399,6 +399,11 @@ static struct agp_device_ids via_agp_device_ids[] 
__devinitdata =
.device_id  = PCI_DEVICE_ID_VIA_P4M890,
.chipset_name   = "P4M890",
},
+   /* P4M900 */
+   {
+   .device_id  = PCI_DEVICE_ID_VIA_VT3364,
+   .chipset_name   = "P4M900",
+   },
{ }, /* dummy final entry, always present */
 };
 
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 07fc574..0d58a39 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1287,6 +1287,7 @@
 #define PCI_DEVICE_ID_VIA_VT3324   0x0324
 #define PCI_DEVICE_ID_VIA_VT3336   0x0336
 #define PCI_DEVICE_ID_VIA_VT3351   0x0351
+#define PCI_DEVICE_ID_VIA_VT3364   0x0364
 #define PCI_DEVICE_ID_VIA_8371_0   0x0391
 #define PCI_DEVICE_ID_VIA_8501_0   0x0501
 #define PCI_DEVICE_ID_VIA_82C561   0x0561
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

agp: balance ioremap checks

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=5bdbc7dc2c07d507b41bffdadc2c8cc13b2d4326
Commit: 5bdbc7dc2c07d507b41bffdadc2c8cc13b2d4326
Parent: 32ddef98f232585f20bc8bdb891029a6a5f633d0
Author: Scott Thompson 
AuthorDate: Sat Aug 25 18:14:00 2007 +1000
Committer:  Dave Airlie <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 18:14:00 2007 +1000

agp: balance ioremap checks

patchset against 2.6.23-rc3.
corrects missing ioremap return checks and balancing on iounmap calls, 
integrated changes per list
recommendations on the original set of patches..

Signed-off-by: Scott Thompson  hushmail.com>
Signed-off-by: Dave Airlie <[EMAIL PROTECTED]>
---
 drivers/char/agp/amd-k7-agp.c |2 ++
 drivers/char/agp/ati-agp.c|3 +++
 drivers/char/agp/hp-agp.c |1 +
 drivers/char/agp/i460-agp.c   |4 
 drivers/char/agp/intel-agp.c  |   14 +-
 drivers/char/agp/nvidia-agp.c |3 +++
 6 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c
index df0ddf1..f60bca7 100644
--- a/drivers/char/agp/amd-k7-agp.c
+++ b/drivers/char/agp/amd-k7-agp.c
@@ -223,6 +223,8 @@ static int amd_irongate_configure(void)
pci_read_config_dword(agp_bridge->dev, AMD_MMBASE, &temp);
temp = (temp & PCI_BASE_ADDRESS_MEM_MASK);
amd_irongate_private.registers = (volatile u8 __iomem *) ioremap(temp, 
4096);
+   if (!amd_irongate_private.registers)
+   return -ENOMEM;
 
/* Write out the address of the gatt table */
writel(agp_bridge->gatt_bus_addr, 
amd_irongate_private.registers+AMD_ATTBASE);
diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c
index da7513d..2d46b71 100644
--- a/drivers/char/agp/ati-agp.c
+++ b/drivers/char/agp/ati-agp.c
@@ -213,6 +213,9 @@ static int ati_configure(void)
temp = (temp & 0xf000);
ati_generic_private.registers = (volatile u8 __iomem *) ioremap(temp, 
4096);
 
+   if (!ati_generic_private.registers)
+   return -ENOMEM;
+
if (is_r200())
pci_write_config_dword(agp_bridge->dev, ATI_RS100_IG_AGPMODE, 
0x2);
else
diff --git a/drivers/char/agp/hp-agp.c b/drivers/char/agp/hp-agp.c
index bcdb149..313a133 100644
--- a/drivers/char/agp/hp-agp.c
+++ b/drivers/char/agp/hp-agp.c
@@ -221,6 +221,7 @@ hp_zx1_lba_init (u64 hpa)
if (cap != PCI_CAP_ID_AGP) {
printk(KERN_ERR PFX "Invalid capability ID 0x%02x at 0x%x\n",
   cap, hp->lba_cap_offset);
+   iounmap(hp->lba_regs);
return -ENODEV;
}
 
diff --git a/drivers/char/agp/i460-agp.c b/drivers/char/agp/i460-agp.c
index 53354bf..75d2aca 100644
--- a/drivers/char/agp/i460-agp.c
+++ b/drivers/char/agp/i460-agp.c
@@ -249,6 +249,10 @@ static int i460_create_gatt_table (struct agp_bridge_data 
*bridge)
num_entries = A_SIZE_8(temp)->num_entries;
 
i460.gatt = ioremap(INTEL_I460_ATTBASE, PAGE_SIZE << page_order);
+   if (!i460.gatt) {
+   printk(KERN_ERR PFX "ioremap failed\n");
+   return -ENOMEM;
+   }
 
/* These are no good, the should be removed from the agp_bridge 
strucure... */
agp_bridge->gatt_table_real = NULL;
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 294cdbf..2c9ca2c 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -930,8 +930,10 @@ static int intel_i915_create_gatt_table(struct 
agp_bridge_data *bridge)
temp &= 0xfff8;
 
intel_private.registers = ioremap(temp,128 * 4096);
-   if (!intel_private.registers)
+   if (!intel_private.registers) {
+   iounmap(intel_private.gtt);
return -ENOMEM;
+   }
 
temp = readl(intel_private.registers+I810_PGETBL_CTL) & 0xf000;
global_cache_flush();   /* FIXME: ? */
@@ -985,13 +987,15 @@ static int intel_i965_create_gatt_table(struct 
agp_bridge_data *bridge)
temp &= 0xfff0;
intel_private.gtt = ioremap((temp + (512 * 1024)) , 512 * 1024);
 
-   if (!intel_private.gtt)
-   return -ENOMEM;
+   if (!intel_private.gtt)
+   return -ENOMEM;
 
 
intel_private.registers = ioremap(temp,128 * 4096);
-   if (!intel_private.registers)
-   return -ENOMEM;
+   if (!intel_private.registers) {
+   iounmap(intel_private.gtt);
+   return -ENOMEM;
+   }
 
temp = readl(intel_private.registers+I810_PGETBL_CTL) & 0xf000;
global_cache_flush();   /* FIXME: ? */
diff --git a/drivers/char/agp/nvidia-agp.c b/drivers/char/agp/nvidia-agp.c
index 6cd7373..225ed2a 100644
--- a/drivers/char/agp/nvidia-agp.c
+++ b/drivers/char/agp/nvidia-agp.c
@@ -157,6 +157,9 @@ static int nvidia_configure(void)
nvidia_private.aperture =
(volatile

ieee1394: sbp2: fix sbp2_remove_device for error cases

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a2ee3f9bbb0ce57102dad8928d54f59acdc4b8f7
Commit: a2ee3f9bbb0ce57102dad8928d54f59acdc4b8f7
Parent: d1caeb02b17c6bc215a9a40a98a1beb92dcbd310
Author: Stefan Richter <[EMAIL PROTECTED]>
AuthorDate: Sat Aug 11 11:51:16 2007 +0200
Committer:  Stefan Richter <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 18:00:26 2007 +0200

ieee1394: sbp2: fix sbp2_remove_device for error cases

Bug found by Olaf Hering <[EMAIL PROTECTED]>:
sbp2util_remove_command_orb_pool requires a valid lu->hi pointer.

Signed-off-by: Stefan Richter <[EMAIL PROTECTED]>
---
 drivers/ieee1394/sbp2.c |   14 +++---
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index 47dbe8f..a81ba8f 100644
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -513,9 +513,9 @@ static int sbp2util_create_command_orb_pool(struct sbp2_lu 
*lu)
return 0;
 }
 
-static void sbp2util_remove_command_orb_pool(struct sbp2_lu *lu)
+static void sbp2util_remove_command_orb_pool(struct sbp2_lu *lu,
+struct hpsb_host *host)
 {
-   struct hpsb_host *host = lu->hi->host;
struct list_head *lh, *next;
struct sbp2_command_info *cmd;
unsigned long flags;
@@ -922,15 +922,16 @@ static void sbp2_remove_device(struct sbp2_lu *lu)
 
if (!lu)
return;
-
hi = lu->hi;
+   if (!hi)
+   goto no_hi;
 
if (lu->shost) {
scsi_remove_host(lu->shost);
scsi_host_put(lu->shost);
}
flush_scheduled_work();
-   sbp2util_remove_command_orb_pool(lu);
+   sbp2util_remove_command_orb_pool(lu, hi->host);
 
list_del(&lu->lu_list);
 
@@ -971,9 +972,8 @@ static void sbp2_remove_device(struct sbp2_lu *lu)
 
lu->ud->device.driver_data = NULL;
 
-   if (hi)
-   module_put(hi->host->driver->owner);
-
+   module_put(hi->host->driver->owner);
+no_hi:
kfree(lu);
 }
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

firewire: fix unloading of fw-ohci while devices are attached

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=8a2d9ed3210464d22fccb9834970629c1c36fa36
Commit: 8a2d9ed3210464d22fccb9834970629c1c36fa36
Parent: a2ee3f9bbb0ce57102dad8928d54f59acdc4b8f7
Author: Stefan Richter <[EMAIL PROTECTED]>
AuthorDate: Tue Aug 21 01:05:14 2007 +0200
Committer:  Stefan Richter <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 18:00:27 2007 +0200

firewire: fix unloading of fw-ohci while devices are attached

Fix panic in run_timer_softirq right after "modprobe -r firewire-ohci"
if a FireWire disk was attached and firewire-sbp2 loaded.

Signed-off-by: Stefan Richter <[EMAIL PROTECTED]>
---
 drivers/firewire/fw-card.c |6 --
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c
index 0aeab32..3e97199 100644
--- a/drivers/firewire/fw-card.c
+++ b/drivers/firewire/fw-card.c
@@ -510,9 +510,11 @@ fw_core_remove_card(struct fw_card *card)
/* Set up the dummy driver. */
card->driver = &dummy_driver;
 
-   fw_flush_transactions(card);
-
fw_destroy_nodes(card);
+   flush_scheduled_work();
+
+   fw_flush_transactions(card);
+   del_timer_sync(&card->flush_timer);
 
fw_card_put(card);
 }
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

firewire: Add ref-counting for sbp2 orbs (fix command abortion)

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e57d2011a6276d55a87f26653a0395f302ce0d51
Commit: e57d2011a6276d55a87f26653a0395f302ce0d51
Parent: 8a2d9ed3210464d22fccb9834970629c1c36fa36
Author: Kristian Høgsberg <[EMAIL PROTECTED]>
AuthorDate: Fri Aug 24 18:59:58 2007 -0400
Committer:  Stefan Richter <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 18:00:27 2007 +0200

firewire: Add ref-counting for sbp2 orbs (fix command abortion)

This handles the case where we get the status write before getting the
complete_transaction callback ("status write for unknown orb").  In
this case, we just assume that the initial orb pointer transaction
succeeded and finish the orb.  To prevent the transaction callback
from touching freed memory, we ref-count the orb structures.

Signed-off-by: Kristian Høgsberg <[EMAIL PROTECTED]>
Signed-off-by: Stefan Richter <[EMAIL PROTECTED]>
---
 drivers/firewire/fw-sbp2.c |   49 +++
 1 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
index ba816ef..238730f 100644
--- a/drivers/firewire/fw-sbp2.c
+++ b/drivers/firewire/fw-sbp2.c
@@ -159,6 +159,7 @@ struct sbp2_pointer {
 
 struct sbp2_orb {
struct fw_transaction t;
+   struct kref kref;
dma_addr_t request_bus;
int rcode;
struct sbp2_pointer pointer;
@@ -280,6 +281,14 @@ static const struct {
 };
 
 static void
+free_orb(struct kref *kref)
+{
+   struct sbp2_orb *orb = container_of(kref, struct sbp2_orb, kref);
+
+   kfree(orb);
+}
+
+static void
 sbp2_status_write(struct fw_card *card, struct fw_request *request,
  int tcode, int destination, int source,
  int generation, int speed,
@@ -312,8 +321,8 @@ sbp2_status_write(struct fw_card *card, struct fw_request 
*request,
spin_lock_irqsave(&card->lock, flags);
list_for_each_entry(orb, &sd->orb_list, link) {
if (STATUS_GET_ORB_HIGH(status) == 0 &&
-   STATUS_GET_ORB_LOW(status) == orb->request_bus &&
-   orb->rcode == RCODE_COMPLETE) {
+   STATUS_GET_ORB_LOW(status) == orb->request_bus) {
+   orb->rcode = RCODE_COMPLETE;
list_del(&orb->link);
break;
}
@@ -325,6 +334,8 @@ sbp2_status_write(struct fw_card *card, struct fw_request 
*request,
else
fw_error("status write for unknown orb\n");
 
+   kref_put(&orb->kref, free_orb);
+
fw_send_response(card, request, RCODE_COMPLETE);
 }
 
@@ -335,13 +346,27 @@ complete_transaction(struct fw_card *card, int rcode,
struct sbp2_orb *orb = data;
unsigned long flags;
 
-   orb->rcode = rcode;
-   if (rcode != RCODE_COMPLETE) {
-   spin_lock_irqsave(&card->lock, flags);
+   /*
+* This is a little tricky.  We can get the status write for
+* the orb before we get this callback.  The status write
+* handler above will assume the orb pointer transaction was
+* successful and set the rcode to RCODE_COMPLETE for the orb.
+* So this callback only sets the rcode if it hasn't already
+* been set and only does the cleanup if the transaction
+* failed and we didn't already get a status write.
+*/
+   spin_lock_irqsave(&card->lock, flags);
+
+   if (orb->rcode == -1)
+   orb->rcode = rcode;
+   if (orb->rcode != RCODE_COMPLETE) {
list_del(&orb->link);
-   spin_unlock_irqrestore(&card->lock, flags);
orb->callback(orb, NULL);
}
+
+   spin_unlock_irqrestore(&card->lock, flags);
+
+   kref_put(&orb->kref, free_orb);
 }
 
 static void
@@ -360,6 +385,10 @@ sbp2_send_orb(struct sbp2_orb *orb, struct fw_unit *unit,
list_add_tail(&orb->link, &sd->orb_list);
spin_unlock_irqrestore(&device->card->lock, flags);
 
+   /* Take a ref for the orb list and for the transaction callback. */
+   kref_get(&orb->kref);
+   kref_get(&orb->kref);
+
fw_send_request(device->card, &orb->t, TCODE_WRITE_BLOCK_REQUEST,
node_id, generation, device->max_speed, offset,
&orb->pointer, sizeof(orb->pointer),
@@ -416,6 +445,7 @@ sbp2_send_management_orb(struct fw_unit *unit, int node_id, 
int generation,
if (orb == NULL)
return -ENOMEM;
 
+   kref_init(&orb->base.kref);
orb->response_bus =
dma_map_single(device->card->device, &orb->response,
   sizeof(orb->response), DMA_FROM_DEVICE);
@@ -490,7 +520,7 @@ sbp2_send_management_orb(struct fw_unit *unit, int node_id, 
int generation,
if (response)
fw_memcpy_from_be32(response,
orb->re

sched: fix CONFIG_SCHED_DEBUG dependency of lockdep sysctls

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=1fc84aaae3bae9646dd4c7798b8c0ff934338909
Commit: 1fc84aaae3bae9646dd4c7798b8c0ff934338909
Parent: d1caeb02b17c6bc215a9a40a98a1beb92dcbd310
Author: Peter Zijlstra <[EMAIL PROTECTED]>
AuthorDate: Sat Aug 25 18:41:52 2007 +0200
Committer:  Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 18:41:52 2007 +0200

sched: fix CONFIG_SCHED_DEBUG dependency of lockdep sysctls

Make the lockdep sysctls not depend on CONFIG_SCHED_DEBUG.

Signed-off-by: Peter Zijlstra <[EMAIL PROTECTED]>
Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
---
 kernel/sysctl.c |   18 +-
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 9029690..ea90ef5 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -283,6 +283,15 @@ static ctl_table kern_table[] = {
.mode   = 0644,
.proc_handler   = &proc_dointvec,
},
+   {
+   .ctl_name   = CTL_UNNUMBERED,
+   .procname   = "sched_features",
+   .data   = &sysctl_sched_features,
+   .maxlen = sizeof(unsigned int),
+   .mode   = 0644,
+   .proc_handler   = &proc_dointvec,
+   },
+#endif
 #ifdef CONFIG_PROVE_LOCKING
{
.ctl_name   = CTL_UNNUMBERED,
@@ -304,15 +313,6 @@ static ctl_table kern_table[] = {
},
 #endif
{
-   .ctl_name   = CTL_UNNUMBERED,
-   .procname   = "sched_features",
-   .data   = &sysctl_sched_features,
-   .maxlen = sizeof(unsigned int),
-   .mode   = 0644,
-   .proc_handler   = &proc_dointvec,
-   },
-#endif
-   {
.ctl_name   = KERN_PANIC,
.procname   = "panic",
.data   = &panic_timeout,
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

sched: adaptive scheduler granularity

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=218050855ece4e923106ab614ac65afa0f618df3
Commit: 218050855ece4e923106ab614ac65afa0f618df3
Parent: 1fc84aaae3bae9646dd4c7798b8c0ff934338909
Author: Peter Zijlstra <[EMAIL PROTECTED]>
AuthorDate: Sat Aug 25 18:41:53 2007 +0200
Committer:  Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 18:41:53 2007 +0200

sched: adaptive scheduler granularity

Instead of specifying the preemption granularity, specify the wanted
latency. By fixing the granlarity to a constany the wakeup latency
it a function of the number of running tasks on the rq.

Invert this relation.

sysctl_sched_granularity becomes a minimum for the dynamic granularity
computed from the new sysctl_sched_latency.

Then use this latency to do more intelligent granularity decisions: if
there are fewer tasks running then we can schedule coarser. This helps
performance while still always keeping the latency target.

Signed-off-by: Peter Zijlstra <[EMAIL PROTECTED]>
Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
---
 include/linux/sched.h |1 +
 kernel/sched.c|   14 ++---
 kernel/sched_fair.c   |   77 +---
 kernel/sysctl.c   |   11 +++
 4 files changed, 86 insertions(+), 17 deletions(-)

diff --git a/include/linux/sched.h b/include/linux/sched.h
index ba78807..322764e 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1399,6 +1399,7 @@ static inline void idle_task_exit(void) {}
 
 extern void sched_idle_next(void);
 
+extern unsigned int sysctl_sched_latency;
 extern unsigned int sysctl_sched_granularity;
 extern unsigned int sysctl_sched_wakeup_granularity;
 extern unsigned int sysctl_sched_batch_wakeup_granularity;
diff --git a/kernel/sched.c b/kernel/sched.c
index 6798328..da26f46 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4911,14 +4911,18 @@ cpumask_t nohz_cpu_mask = CPU_MASK_NONE;
 static inline void sched_init_granularity(void)
 {
unsigned int factor = 1 + ilog2(num_online_cpus());
-   const unsigned long gran_limit = 1;
+   const unsigned long limit = 1;
 
sysctl_sched_granularity *= factor;
-   if (sysctl_sched_granularity > gran_limit)
-   sysctl_sched_granularity = gran_limit;
+   if (sysctl_sched_granularity > limit)
+   sysctl_sched_granularity = limit;
 
-   sysctl_sched_runtime_limit = sysctl_sched_granularity * 5;
-   sysctl_sched_wakeup_granularity = sysctl_sched_granularity / 2;
+   sysctl_sched_latency *= factor;
+   if (sysctl_sched_latency > limit)
+   sysctl_sched_latency = limit;
+
+   sysctl_sched_runtime_limit = sysctl_sched_latency * 5;
+   sysctl_sched_wakeup_granularity = sysctl_sched_latency / 2;
 }
 
 #ifdef CONFIG_SMP
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 4d6b7e2..0ba1e60 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -15,23 +15,32 @@
  *
  *  Scaled math optimizations by Thomas Gleixner
  *  Copyright (C) 2007, Thomas Gleixner <[EMAIL PROTECTED]>
+ *
+ *  Adaptive scheduling granularity, math enhancements by Peter Zijlstra
+ *  Copyright (C) 2007 Red Hat, Inc., Peter Zijlstra <[EMAIL PROTECTED]>
  */
 
 /*
- * Preemption granularity:
- * (default: 10 msec, units: nanoseconds)
+ * Targeted preemption latency for CPU-bound tasks:
+ * (default: 20ms, units: nanoseconds)
  *
- * NOTE: this granularity value is not the same as the concept of
- * 'timeslice length' - timeslices in CFS will typically be somewhat
- * larger than this value. (to see the precise effective timeslice
- * length of your workload, run vmstat and monitor the context-switches
- * field)
+ * NOTE: this latency value is not the same as the concept of
+ * 'timeslice length' - timeslices in CFS are of variable length.
+ * (to see the precise effective timeslice length of your workload,
+ *  run vmstat and monitor the context-switches field)
  *
  * On SMP systems the value of this is multiplied by the log2 of the
  * number of CPUs. (i.e. factor 2x on 2-way systems, 3x on 4-way
  * systems, 4x on 8-way systems, 5x on 16-way systems, etc.)
+ * Targeted preemption latency for CPU-bound tasks:
  */
-unsigned int sysctl_sched_granularity __read_mostly = 1000UL;
+unsigned int sysctl_sched_latency __read_mostly = 2000ULL;
+
+/*
+ * Minimal preemption granularity for CPU-bound tasks:
+ * (default: 2 msec, units: nanoseconds)
+ */
+unsigned int sysctl_sched_granularity __read_mostly = 200ULL;
 
 /*
  * SCHED_BATCH wake-up granularity.
@@ -213,6 +222,49 @@ static struct sched_entity *__pick_next_entity(struct 
cfs_rq *cfs_rq)
  */
 
 /*
+ * Calculate the preemption granularity needed to schedule every
+ * runnable task once per sysctl_sched_latency amount of time.
+ * (down to a sensible low limit on granularity)
+ *
+ * For example, if there are 2 

sched: cleanup, sched_granularity -> sched_min_granularity

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=172ac3dbb7d3e528ac53d08a34df88d1ac53c534
Commit: 172ac3dbb7d3e528ac53d08a34df88d1ac53c534
Parent: 218050855ece4e923106ab614ac65afa0f618df3
Author: Ingo Molnar <[EMAIL PROTECTED]>
AuthorDate: Sat Aug 25 18:41:53 2007 +0200
Committer:  Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 18:41:53 2007 +0200

sched: cleanup, sched_granularity -> sched_min_granularity

due to adaptive granularity scheduling the role of sched_granularity
has changed to "minimum granularity", so rename the variable (and the
tunable) accordingly.

Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
Signed-off-by: Peter Zijlstra <[EMAIL PROTECTED]>
---
 include/linux/sched.h |2 +-
 kernel/sched.c|6 +++---
 kernel/sched_fair.c   |4 ++--
 kernel/sysctl.c   |4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 322764e..bd6a032 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1400,7 +1400,7 @@ static inline void idle_task_exit(void) {}
 extern void sched_idle_next(void);
 
 extern unsigned int sysctl_sched_latency;
-extern unsigned int sysctl_sched_granularity;
+extern unsigned int sysctl_sched_min_granularity;
 extern unsigned int sysctl_sched_wakeup_granularity;
 extern unsigned int sysctl_sched_batch_wakeup_granularity;
 extern unsigned int sysctl_sched_stat_granularity;
diff --git a/kernel/sched.c b/kernel/sched.c
index da26f46..a40ab65 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4913,9 +4913,9 @@ static inline void sched_init_granularity(void)
unsigned int factor = 1 + ilog2(num_online_cpus());
const unsigned long limit = 1;
 
-   sysctl_sched_granularity *= factor;
-   if (sysctl_sched_granularity > limit)
-   sysctl_sched_granularity = limit;
+   sysctl_sched_min_granularity *= factor;
+   if (sysctl_sched_min_granularity > limit)
+   sysctl_sched_min_granularity = limit;
 
sysctl_sched_latency *= factor;
if (sysctl_sched_latency > limit)
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 0ba1e60..ee37718 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -40,7 +40,7 @@ unsigned int sysctl_sched_latency __read_mostly = 2000ULL;
  * Minimal preemption granularity for CPU-bound tasks:
  * (default: 2 msec, units: nanoseconds)
  */
-unsigned int sysctl_sched_granularity __read_mostly = 200ULL;
+unsigned int sysctl_sched_min_granularity __read_mostly = 200ULL;
 
 /*
  * SCHED_BATCH wake-up granularity.
@@ -258,7 +258,7 @@ sched_granularity(struct cfs_rq *cfs_rq)
 
if (nr > 1) {
gran = gran/nr - gran/nr/nr;
-   gran = max(gran, sysctl_sched_granularity);
+   gran = max(gran, sysctl_sched_min_granularity);
}
 
return gran;
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 9e3d296..6ace893 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -222,8 +222,8 @@ static ctl_table kern_table[] = {
 #ifdef CONFIG_SCHED_DEBUG
{
.ctl_name   = CTL_UNNUMBERED,
-   .procname   = "sched_granularity_ns",
-   .data   = &sysctl_sched_granularity,
+   .procname   = "sched_min_granularity_ns",
+   .data   = &sysctl_sched_min_granularity,
.maxlen = sizeof(unsigned int),
.mode   = 0644,
.proc_handler   = &proc_dointvec_minmax,
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

sched: s/sched_latency/sched_min_granularity

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=50c46637aa894f904e2fb39086a3d7732f68bd50
Commit: 50c46637aa894f904e2fb39086a3d7732f68bd50
Parent: a3ce8ea66ae9379235334a989ed78a1ea518b0b3
Author: Ingo Molnar <[EMAIL PROTECTED]>
AuthorDate: Sat Aug 25 22:17:19 2007 +0200
Committer:  Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 22:17:19 2007 +0200

sched: s/sched_latency/sched_min_granularity

runtime limit and wakeup granularity used to be a function of
granularity and that was incorrect changed to sched_latency.

Fix this to make wakeup granularity a function of min-granularity,
and the runtime limit equal to latency.

Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
---
 kernel/sched.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/sched.c b/kernel/sched.c
index a40ab65..9fe473a 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4921,8 +4921,8 @@ static inline void sched_init_granularity(void)
if (sysctl_sched_latency > limit)
sysctl_sched_latency = limit;
 
-   sysctl_sched_runtime_limit = sysctl_sched_latency * 5;
-   sysctl_sched_wakeup_granularity = sysctl_sched_latency / 2;
+   sysctl_sched_runtime_limit = sysctl_sched_latency;
+   sysctl_sched_wakeup_granularity = sysctl_sched_min_granularity / 2;
 }
 
 #ifdef CONFIG_SMP
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[MIPS] SMTC: Fix secondary VPE interrupt mask initialization.

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=dc0366bf3cd35e4be89f715ff834a06c590fff7a
Commit: dc0366bf3cd35e4be89f715ff834a06c590fff7a
Parent: 99e480d81ca98c25918c460fdb5ca876d7df6178
Author: Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Wed Aug 1 19:42:37 2007 +0100
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:49 2007 +0100

[MIPS] SMTC: Fix secondary VPE interrupt mask initialization.

Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/mips-boards/malta/malta_smtc.c |9 +
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/arch/mips/mips-boards/malta/malta_smtc.c 
b/arch/mips/mips-boards/malta/malta_smtc.c
index 0fb4c26..ea8f3bb 100644
--- a/arch/mips/mips-boards/malta/malta_smtc.c
+++ b/arch/mips/mips-boards/malta/malta_smtc.c
@@ -42,10 +42,11 @@ void prom_init_secondary(void)
myvpe = read_c0_tcbind() & TCBIND_CURVPE;
if (myvpe != 0) {
/* Ideally, this should be done only once per VPE, but... */
-   clear_c0_status(STATUSF_IP2);
-   set_c0_status(STATUSF_IP0 | STATUSF_IP1 | STATUSF_IP3
-   | STATUSF_IP4 | STATUSF_IP5 | STATUSF_IP6
-   | STATUSF_IP7);
+   clear_c0_status(ST0_IM);
+   set_c0_status((0x100 << cp0_compare_irq)
+   | (0x100 << MIPS_CPU_IPI_IRQ));
+   if (cp0_perfcount_irq >= 0)
+   set_c0_status(0x100 << cp0_perfcount_irq);
}
 
 smtc_init_secondary();
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[MIPS] Sibyte: CONFIG_SIBYTE_SB1250_DUART -> CONFIG_SERIAL_SB1250_DUART

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=477f949e0ad7f1d3503a87b9f158d70c29abc918
Commit: 477f949e0ad7f1d3503a87b9f158d70c29abc918
Parent: 7acae224a423a492454d6550ce65c9af556d02c7
Author: Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Thu Aug 2 12:08:32 2007 +0100
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:51 2007 +0100

[MIPS] Sibyte: CONFIG_SIBYTE_SB1250_DUART -> CONFIG_SERIAL_SB1250_DUART

This is needed since the Sibyte serial driver was exchanged.

Issue report by Imre Kaloz <[EMAIL PROTECTED]>.

Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/configs/bigsur_defconfig   |4 ++--
 arch/mips/configs/sb1250-swarm_defconfig |4 ++--
 arch/mips/sibyte/bcm1480/irq.c   |4 ++--
 arch/mips/sibyte/cfe/console.c   |2 +-
 arch/mips/sibyte/sb1250/irq.c|4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/mips/configs/bigsur_defconfig 
b/arch/mips/configs/bigsur_defconfig
index 67a80f4..700a3a2 100644
--- a/arch/mips/configs/bigsur_defconfig
+++ b/arch/mips/configs/bigsur_defconfig
@@ -663,8 +663,8 @@ CONFIG_MOXA_SMARTIO_NEW=m
 # CONFIG_SX is not set
 # CONFIG_RIO is not set
 # CONFIG_STALDRV is not set
-CONFIG_SIBYTE_SB1250_DUART=y
-CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y
+CONFIG_SERIAL_SB1250_DUART=y
+CONFIG_SERIAL_SB1250_DUART_CONSOLE=y
 
 #
 # Serial drivers
diff --git a/arch/mips/configs/sb1250-swarm_defconfig 
b/arch/mips/configs/sb1250-swarm_defconfig
index e72fdf3..93f9e83 100644
--- a/arch/mips/configs/sb1250-swarm_defconfig
+++ b/arch/mips/configs/sb1250-swarm_defconfig
@@ -655,8 +655,8 @@ CONFIG_MOXA_SMARTIO_NEW=m
 # CONFIG_SX is not set
 # CONFIG_RIO is not set
 # CONFIG_STALDRV is not set
-CONFIG_SIBYTE_SB1250_DUART=y
-CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y
+CONFIG_SERIAL_SB1250_DUART=y
+CONFIG_SERIAL_SB1250_DUART_CONSOLE=y
 
 #
 # Serial drivers
diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c
index ba0c4b7..79ae6ef 100644
--- a/arch/mips/sibyte/bcm1480/irq.c
+++ b/arch/mips/sibyte/bcm1480/irq.c
@@ -76,7 +76,7 @@ __setup("nokgdb", nokgdb);
 
 /* Default to UART1 */
 int kgdb_port = 1;
-#ifdef CONFIG_SIBYTE_SB1250_DUART
+#ifdef CONFIG_SERIAL_SB1250_DUART
 extern char sb1250_duart_present[];
 #endif
 #endif
@@ -404,7 +404,7 @@ void __init arch_init_irq(void)
if (kgdb_flag) {
kgdb_irq = K_BCM1480_INT_UART_0 + kgdb_port;
 
-#ifdef CONFIG_SIBYTE_SB1250_DUART
+#ifdef CONFIG_SERIAL_SB1250_DUART
sb1250_duart_present[kgdb_port] = 0;
 #endif
/* Setup uart 1 settings, mapper */
diff --git a/arch/mips/sibyte/cfe/console.c b/arch/mips/sibyte/cfe/console.c
index c6ec748..4cec9d7 100644
--- a/arch/mips/sibyte/cfe/console.c
+++ b/arch/mips/sibyte/cfe/console.c
@@ -46,7 +46,7 @@ static int cfe_console_setup(struct console *cons, char *str)
/* XXXKW think about interaction with 'console=' cmdline arg */
/* If none of the console options are configured, the build will break. 
*/
if (cfe_getenv("BOOT_CONSOLE", consdev, 32) >= 0) {
-#ifdef CONFIG_SIBYTE_SB1250_DUART
+#ifdef CONFIG_SERIAL_SB1250_DUART
if (!strcmp(consdev, "uart0")) {
setleds("u0cn");
} else if (!strcmp(consdev, "uart1")) {
diff --git a/arch/mips/sibyte/sb1250/irq.c b/arch/mips/sibyte/sb1250/irq.c
index 0e6a13c..ad593a6 100644
--- a/arch/mips/sibyte/sb1250/irq.c
+++ b/arch/mips/sibyte/sb1250/irq.c
@@ -61,7 +61,7 @@ static int kgdb_irq;
 
 /* Default to UART1 */
 int kgdb_port = 1;
-#ifdef CONFIG_SIBYTE_SB1250_DUART
+#ifdef CONFIG_SERIAL_SB1250_DUART
 extern char sb1250_duart_present[];
 #endif
 #endif
@@ -359,7 +359,7 @@ void __init arch_init_irq(void)
if (kgdb_flag) {
kgdb_irq = K_INT_UART_0 + kgdb_port;
 
-#ifdef CONFIG_SIBYTE_SB1250_DUART
+#ifdef CONFIG_SERIAL_SB1250_DUART
sb1250_duart_present[kgdb_port] = 0;
 #endif
/* Setup uart 1 settings, mapper */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[MIPS] The irq_chip for TX39/TX49 SoCs

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=8420fd00e88ef4f6082866aa151bc753b006b3b6
Commit: 8420fd00e88ef4f6082866aa151bc753b006b3b6
Parent: 477f949e0ad7f1d3503a87b9f158d70c29abc918
Author: Atsushi Nemoto <[EMAIL PROTECTED]>
AuthorDate: Thu Aug 2 23:35:53 2007 +0900
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:52 2007 +0100

[MIPS] The irq_chip for TX39/TX49 SoCs

Add generic irq_chip for TX39/TX49 SoCs.  This can be replace
jmr3927_irq_irc, tx4927_irq_pic_type and tx4938_irq_pic_type.

Signed-off-by: Atsushi Nemoto <[EMAIL PROTECTED]>
Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/Kconfig   |3 +
 arch/mips/kernel/Makefile   |1 +
 arch/mips/kernel/irq_txx9.c |  196 +++
 include/asm-mips/txx9irq.h  |   30 +++
 4 files changed, 230 insertions(+), 0 deletions(-)

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 2775dd6..cec0d84 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -767,6 +767,9 @@ config IRQ_MSP_SLP
 config IRQ_MSP_CIC
bool
 
+config IRQ_TXX9
+   bool
+
 config MIPS_BOARDS_GEN
bool
 
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index 07344cb..2fd96d9 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -50,6 +50,7 @@ obj-$(CONFIG_IRQ_CPU) += irq_cpu.o
 obj-$(CONFIG_IRQ_CPU_RM7K) += irq-rm7000.o
 obj-$(CONFIG_IRQ_CPU_RM9K) += irq-rm9000.o
 obj-$(CONFIG_MIPS_BOARDS_GEN)  += irq-msc01.o
+obj-$(CONFIG_IRQ_TXX9) += irq_txx9.o
 
 obj-$(CONFIG_32BIT)+= scall32-o32.o
 obj-$(CONFIG_64BIT)+= scall64-64.o
diff --git a/arch/mips/kernel/irq_txx9.c b/arch/mips/kernel/irq_txx9.c
new file mode 100644
index 000..172e14b
--- /dev/null
+++ b/arch/mips/kernel/irq_txx9.c
@@ -0,0 +1,196 @@
+/*
+ * linux/arch/mips/kernel/irq_txx9.c
+ *
+ * Based on linux/arch/mips/jmr3927/rbhma3100/irq.c,
+ *  linux/arch/mips/tx4927/common/tx4927_irq.c,
+ *  linux/arch/mips/tx4938/common/irq.c
+ *
+ * Copyright 2001, 2003-2005 MontaVista Software Inc.
+ * Author: MontaVista Software, Inc.
+ * [EMAIL PROTECTED]
+ * [EMAIL PROTECTED]
+ * Copyright (C) 2000-2001 Toshiba Corporation
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include 
+#include 
+#include 
+#include 
+
+struct txx9_irc_reg {
+   u32 cer;
+   u32 cr[2];
+   u32 unused0;
+   u32 ilr[8];
+   u32 unused1[4];
+   u32 imr;
+   u32 unused2[7];
+   u32 scr;
+   u32 unused3[7];
+   u32 ssr;
+   u32 unused4[7];
+   u32 csr;
+};
+
+/* IRCER : Int. Control Enable */
+#define TXx9_IRCER_ICE 0x0001
+
+/* IRCR : Int. Control */
+#define TXx9_IRCR_LOW  0x
+#define TXx9_IRCR_HIGH 0x0001
+#define TXx9_IRCR_DOWN 0x0002
+#define TXx9_IRCR_UP   0x0003
+#define TXx9_IRCR_EDGE(cr) ((cr) & 0x0002)
+
+/* IRSCR : Int. Status Control */
+#define TXx9_IRSCR_EIClrE  0x0100
+#define TXx9_IRSCR_EIClr_MASK  0x000f
+
+/* IRCSR : Int. Current Status */
+#define TXx9_IRCSR_IF  0x0001
+#define TXx9_IRCSR_ILV_MASK0x0700
+#define TXx9_IRCSR_IVL_MASK0x001f
+
+#define irc_dlevel 0
+#define irc_elevel 1
+
+static struct txx9_irc_reg __iomem *txx9_ircptr __read_mostly;
+
+static struct {
+   unsigned char level;
+   unsigned char mode;
+} txx9irq[TXx9_MAX_IR] __read_mostly;
+
+static void txx9_irq_unmask(unsigned int irq)
+{
+   unsigned int irq_nr = irq - TXX9_IRQ_BASE;
+   u32 __iomem *ilrp = &txx9_ircptr->ilr[(irq_nr % 16 ) / 2];
+   int ofs = irq_nr / 16 * 16 + (irq_nr & 1) * 8;
+
+   __raw_writel((__raw_readl(ilrp) & ~(0xff << ofs))
+| (txx9irq[irq_nr].level << ofs),
+ilrp);
+#ifdef CONFIG_CPU_TX39XX
+   /* update IRCSR */
+   __raw_writel(0, &txx9_ircptr->imr);
+   __raw_writel(irc_elevel, &txx9_ircptr->imr);
+#endif
+}
+
+static inline void txx9_irq_mask(unsigned int irq)
+{
+   unsigned int irq_nr = irq - TXX9_IRQ_BASE;
+   u32 __iomem *ilrp = &txx9_ircptr->ilr[(irq_nr % 16) / 2];
+   int ofs = irq_nr / 16 * 16 + (irq_nr & 1) * 8;
+
+   __raw_writel((__raw_readl(ilrp) & ~(0xff << ofs))
+| (irc_dlevel << ofs),
+ilrp);
+#ifdef CONFIG_CPU_TX39XX
+   /* update IRCSR */
+   __raw_writel(0, &txx9_ircptr->imr);
+   __raw_writel(irc_elevel, &txx9_ircptr->imr);
+   /* flush write buffer */
+   __raw_readl(&txx9_ircptr->ssr);
+#else
+   mmiowb();
+#endif
+}
+
+static void txx9_irq_mask_ack(unsigned int irq)
+{
+   unsigned int irq_nr = irq - TXX9_IRQ_BASE;
+
+   txx9_irq_mask(irq);
+   if (TXx9_IRCR_EDGE(txx9irq[irq_nr].mode)) {
+

[MIPS] Remove unused pnx8550 Kconfig

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f201b46328ac378bbd0894dd3a0c72bce4c1131e
Commit: f201b46328ac378bbd0894dd3a0c72bce4c1131e
Parent: d806cb2b601c0d6c55b29e1ef9ca2f96f499ea1c
Author: Yoichi Yuasa <[EMAIL PROTECTED]>
AuthorDate: Thu Aug 2 12:44:44 2007 +0900
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:49 2007 +0100

[MIPS] Remove unused pnx8550 Kconfig

Signed-off-by: Yoichi Yuasa <[EMAIL PROTECTED]>
Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/Kconfig|1 -
 arch/mips/philips/pnx8550/common/Kconfig |1 -
 2 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index f08c735..2775dd6 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -604,7 +604,6 @@ source "arch/mips/sibyte/Kconfig"
 source "arch/mips/tx4927/Kconfig"
 source "arch/mips/tx4938/Kconfig"
 source "arch/mips/vr41xx/Kconfig"
-source "arch/mips/philips/pnx8550/common/Kconfig"
 
 endmenu
 
diff --git a/arch/mips/philips/pnx8550/common/Kconfig 
b/arch/mips/philips/pnx8550/common/Kconfig
deleted file mode 100644
index 072572d..000
--- a/arch/mips/philips/pnx8550/common/Kconfig
+++ /dev/null
@@ -1 +0,0 @@
-# Place holder
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[MIPS] Compute PGD_ORDER from the select page size.

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=99e480d81ca98c25918c460fdb5ca876d7df6178
Commit: 99e480d81ca98c25918c460fdb5ca876d7df6178
Parent: 03b8b8e7c9c36e2d7c4bc9c63eeed872e6f01ad0
Author: Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Wed Aug 1 15:46:18 2007 +0100
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:49 2007 +0100

[MIPS] Compute PGD_ORDER from the select page size.

Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 include/asm-mips/pgtable-32.h |   10 ++
 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/include/asm-mips/pgtable-32.h b/include/asm-mips/pgtable-32.h
index ff29485..59c865d 100644
--- a/include/asm-mips/pgtable-32.h
+++ b/include/asm-mips/pgtable-32.h
@@ -51,17 +51,11 @@ extern int add_temporary_entry(unsigned long entrylo0, 
unsigned long entrylo1,
  * Entries per page directory level: we use two-level, so
  * we don't really have any PUD/PMD directory physically.
  */
-#ifdef CONFIG_64BIT_PHYS_ADDR
-#define PGD_ORDER  1
-#define PUD_ORDER  ai_attempt_to_allocate_pud
-#define PMD_ORDER  1
-#define PTE_ORDER  0
-#else
-#define PGD_ORDER  0
+#define __PGD_ORDER(32 - 3 * PAGE_SHIFT + PGD_T_LOG2 + PTE_T_LOG2)
+#define PGD_ORDER  (__PGD_ORDER >= 0 ? __PGD_ORDER : 0)
 #define PUD_ORDER  ai_attempt_to_allocate_pud
 #define PMD_ORDER  1
 #define PTE_ORDER  0
-#endif
 
 #define PTRS_PER_PGD   ((PAGE_SIZE << PGD_ORDER) / sizeof(pgd_t))
 #define PTRS_PER_PTE   ((PAGE_SIZE << PTE_ORDER) / sizeof(pte_t))
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[POWERPC] Fix SLB initialization at boot time

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=175587cca7447daf5a13e4a53d32360ed8cba804
Commit: 175587cca7447daf5a13e4a53d32360ed8cba804
Parent: e120e8d03a263cf75f2abc0f8b3a03a65cfd3b88
Author: Paul Mackerras <[EMAIL PROTECTED]>
AuthorDate: Sat Aug 25 13:14:28 2007 +1000
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 16:58:43 2007 +1000

[POWERPC] Fix SLB initialization at boot time

This partially reverts edd0622bd2e8f755c960827e15aa6908c3c5aa94.

It turns out that the part of that commit that aimed to ensure that we
created an SLB entry for the kernel stack on secondary CPUs when
starting the CPU didn't achieve its aim, and in fact caused a
regression, because get_paca()->kstack is not initialized at the point
where slb_initialize is called.

This therefore just reverts that part of that commit, while keeping
the change to slb_flush_and_rebolt, which is correct and necessary.

Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 arch/powerpc/mm/slb.c |   36 
 1 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/arch/powerpc/mm/slb.c b/arch/powerpc/mm/slb.c
index a73d2d7..ff1811a 100644
--- a/arch/powerpc/mm/slb.c
+++ b/arch/powerpc/mm/slb.c
@@ -74,6 +74,22 @@ static inline void slb_shadow_clear(unsigned long entry)
get_slb_shadow()->save_area[entry].esid = 0;
 }
 
+static inline void create_shadowed_slbe(unsigned long ea, unsigned long flags,
+   unsigned long entry)
+{
+   /*
+* Updating the shadow buffer before writing the SLB ensures
+* we don't get a stale entry here if we get preempted by PHYP
+* between these two statements.
+*/
+   slb_shadow_update(ea, flags, entry);
+
+   asm volatile("slbmte  %0,%1" :
+: "r" (mk_vsid_data(ea, flags)),
+  "r" (mk_esid_data(ea, entry))
+: "memory" );
+}
+
 void slb_flush_and_rebolt(void)
 {
/* If you change this make sure you change SLB_NUM_BOLTED
@@ -226,12 +242,16 @@ void slb_initialize(void)
vflags = SLB_VSID_KERNEL | vmalloc_llp;
 
/* Invalidate the entire SLB (even slot 0) & all the ERATS */
-   slb_shadow_update(PAGE_OFFSET, lflags, 0);
-   asm volatile("isync; slbia; sync; slbmte  %0,%1; isync" ::
-"r" (get_slb_shadow()->save_area[0].vsid),
-"r" (get_slb_shadow()->save_area[0].esid) : "memory");
-
-   slb_shadow_update(VMALLOC_START, vflags, 1);
-
-   slb_flush_and_rebolt();
+   asm volatile("isync":::"memory");
+   asm volatile("slbmte  %0,%0"::"r" (0) : "memory");
+   asm volatile("isync; slbia; isync":::"memory");
+   create_shadowed_slbe(PAGE_OFFSET, lflags, 0);
+
+   create_shadowed_slbe(VMALLOC_START, vflags, 1);
+
+   /* We don't bolt the stack for the time being - we're in boot,
+* so the stack is in the bolted segment.  By the time it goes
+* elsewhere, we'll call _switch() which will bolt in the new
+* one. */
+   asm volatile("isync":::"memory");
 }
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[POWERPC] Fix undefined reference to device_power_up/resume

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e120e8d03a263cf75f2abc0f8b3a03a65cfd3b88
Commit: e120e8d03a263cf75f2abc0f8b3a03a65cfd3b88
Parent: b22ddc703c5daa603d8d53881b530da3cab94cd4
Author: Olaf Hering <[EMAIL PROTECTED]>
AuthorDate: Sat Aug 25 05:42:01 2007 +1000
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 16:58:27 2007 +1000

[POWERPC] Fix undefined reference to device_power_up/resume

Current Linus tree fails to link on pmac32:

drivers/built-in.o: In function `pmac_wakeup_devices':
via-pmu.c:(.text+0x5bab4): undefined reference to `device_power_up'
via-pmu.c:(.text+0x5bb08): undefined reference to `device_resume'
drivers/built-in.o: In function `pmac_suspend_devices':
via-pmu.c:(.text+0x5c260): undefined reference to `device_power_down'
via-pmu.c:(.text+0x5c27c): undefined reference to `device_resume'
make[1]: *** [.tmp_vmlinux1] Error 1

changing CONFIG_PM > CONFIG_PM_SLEEP leads to:

drivers/built-in.o: In function `pmu_led_set':
via-pmu-led.c:(.text+0x5cdca): undefined reference to `pmu_sys_suspended'
via-pmu-led.c:(.text+0x5cdce): undefined reference to `pmu_sys_suspended'
drivers/built-in.o: In function `pmu_req_done':
via-pmu-led.c:(.text+0x5ce3e): undefined reference to `pmu_sys_suspended'
via-pmu-led.c:(.text+0x5ce42): undefined reference to `pmu_sys_suspended'
drivers/built-in.o: In function `adb_init':
(.init.text+0x4c5c): undefined reference to `pmu_register_sleep_notifier'
make[1]: *** [.tmp_vmlinux1] Error 1

So change even more places from PM to PM_SLEEP to allow linking.

Signed-off-by: Olaf Hering <[EMAIL PROTECTED]>
Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 drivers/macintosh/adb.c |4 ++--
 drivers/macintosh/via-pmu.c |   34 +-
 include/linux/pmu.h |2 +-
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c
index bc77c5e..5c742a5 100644
--- a/drivers/macintosh/adb.c
+++ b/drivers/macintosh/adb.c
@@ -89,7 +89,7 @@ static int sleepy_trackpad;
 static int autopoll_devs;
 int __adb_probe_sync;
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static void adb_notify_sleep(struct pmu_sleep_notifier *self, int when);
 static struct pmu_sleep_notifier adb_sleep_notifier = {
adb_notify_sleep,
@@ -313,7 +313,7 @@ int __init adb_init(void)
printk(KERN_WARNING "Warning: no ADB interface detected\n");
adb_controller = NULL;
} else {
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
pmu_register_sleep_notifier(&adb_sleep_notifier);
 #endif /* CONFIG_PM */
 #ifdef CONFIG_PPC
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index 157080b..04f3973 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -152,10 +152,10 @@ static spinlock_t pmu_lock;
 static u8 pmu_intr_mask;
 static int pmu_version;
 static int drop_interrupts;
-#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
+#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
 static int option_lid_wakeup = 1;
-#endif /* CONFIG_PM && CONFIG_PPC32 */
-#if 
(defined(CONFIG_PM)&&defined(CONFIG_PPC32))||defined(CONFIG_PMAC_BACKLIGHT_LEGACY)
+#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
+#if 
(defined(CONFIG_PM_SLEEP)&&defined(CONFIG_PPC32))||defined(CONFIG_PMAC_BACKLIGHT_LEGACY)
 static int sleep_in_progress;
 #endif
 static unsigned long async_req_locks;
@@ -875,7 +875,7 @@ proc_read_options(char *page, char **start, off_t off,
 {
char *p = page;
 
-#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
+#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
if (pmu_kind == PMU_KEYLARGO_BASED &&
pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,-1) >= 0)
p += sprintf(p, "lid_wakeup=%d\n", option_lid_wakeup);
@@ -916,7 +916,7 @@ proc_write_options(struct file *file, const char __user 
*buffer,
*(val++) = 0;
while(*val == ' ')
val++;
-#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
+#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
if (pmu_kind == PMU_KEYLARGO_BASED &&
pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,-1) >= 0)
if (!strcmp(label, "lid_wakeup"))
@@ -1738,7 +1738,7 @@ pmu_present(void)
return via != 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 
 static LIST_HEAD(sleep_notifiers);
 
@@ -1769,9 +1769,9 @@ pmu_unregister_sleep_notifier(struct pmu_sleep_notifier* 
n)
return 0;
 }
 EXPORT_SYMBOL(pmu_unregister_sleep_notifier);
-#endif /* CONFIG_PM */
+#endif /* CONFIG_PM_SLEEP */
 
-#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
+#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
 
 /* Sleep is broadcast last-to-first */
 static void broadcast_sleep(int when)
@@ -2390,7 +2390,7 @@ powerbook_sleep_3400(void)

[POWERPC] cell: Update cell_defconfig for 2.6.23

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=b22ddc703c5daa603d8d53881b530da3cab94cd4
Commit: b22ddc703c5daa603d8d53881b530da3cab94cd4
Parent: b0e81ebb1062eba20fbcbe459662c0a6ec6075f7
Author: Arnd Bergmann <[EMAIL PROTECTED]>
AuthorDate: Thu Aug 23 03:09:17 2007 +1000
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 16:58:27 2007 +1000

[POWERPC] cell: Update cell_defconfig for 2.6.23

Signed-off-by: Arnd Bergmann <[EMAIL PROTECTED]>
Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 arch/powerpc/configs/cell_defconfig |  220 ---
 1 files changed, 76 insertions(+), 144 deletions(-)

diff --git a/arch/powerpc/configs/cell_defconfig 
b/arch/powerpc/configs/cell_defconfig
index d9ac24e..8b47c84 100644
--- a/arch/powerpc/configs/cell_defconfig
+++ b/arch/powerpc/configs/cell_defconfig
@@ -1,9 +1,23 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc6
-# Tue Jun 26 12:32:34 2007
+# Linux kernel version: 2.6.23-rc3
+# Wed Aug 22 15:19:19 2007
 #
 CONFIG_PPC64=y
+
+#
+# Processor support
+#
+# CONFIG_POWER4_ONLY is not set
+CONFIG_POWER3=y
+CONFIG_POWER4=y
+CONFIG_PPC_FPU=y
+CONFIG_ALTIVEC=y
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_MM_SLICES=y
+CONFIG_VIRT_CPU_ACCOUNTING=y
+CONFIG_SMP=y
+CONFIG_NR_CPUS=4
 CONFIG_64BIT=y
 CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
@@ -15,6 +29,7 @@ CONFIG_ARCH_HAS_ILOG2_U64=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_ARCH_NO_VIRT_TO_BUS=y
 CONFIG_PPC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_COMPAT=y
@@ -22,51 +37,33 @@ CONFIG_SYSVIPC_COMPAT=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
+CONFIG_OF=y
 CONFIG_PPC_UDBG_16550=y
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_GENERIC_BUG=y
 # CONFIG_DEFAULT_UIMAGE is not set
-
-#
-# Processor support
-#
-# CONFIG_POWER4_ONLY is not set
-CONFIG_POWER3=y
-CONFIG_POWER4=y
-CONFIG_PPC_FPU=y
 # CONFIG_PPC_DCR_NATIVE is not set
 CONFIG_PPC_DCR_MMIO=y
 CONFIG_PPC_DCR=y
 CONFIG_PPC_OF_PLATFORM_PCI=y
-CONFIG_ALTIVEC=y
-CONFIG_PPC_STD_MMU=y
-CONFIG_PPC_MM_SLICES=y
-CONFIG_VIRT_CPU_ACCOUNTING=y
-CONFIG_SMP=y
-CONFIG_NR_CPUS=4
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
@@ -96,16 +93,13 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
-# CONFIG_SLUB is not set
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -113,12 +107,9 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
 CONFIG_STOP_MACHINE=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -138,7 +129,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 CONFIG_PPC_MULTIPLATFORM=y
 # CONFIG_EMBEDDED6xx is not set
-# CONFIG_APUS is not set
+# CONFIG_PPC_82xx is not set
+# CONFIG_PPC_83xx is not set
+# CONFIG_PPC_86xx is not set
 # CONFIG_PPC_PSERIES is not set
 # CONFIG_PPC_ISERIES is not set
 # CONFIG_PPC_MPC52xx is not set
@@ -158,7 +151,11 @@ CONFIG_PS3_HTAB_SIZE=20
 CONFIG_PS3_USE_LPAR_ADDR=y
 CONFIG_PS3_VUART=y
 CONFIG_PS3_PS3AV=y
-CONFIG_PS3_SYS_MANAGER=y
+CONFIG_PS3_SYS_MANAGER=m
+CONFIG_PS3_STORAGE=y
+CONFIG_PS3_DISK=y
+CONFIG_PS3_ROM=m
+CONFIG_PS3_FLASH=m
 CONFIG_PPC_CELL=y
 CONFIG_PPC_CELL_NATIVE=y
 CONFIG_PPC_IBM_CELL_BLADE=y
@@ -171,6 +168,7 @@ CONFIG_SPU_BASE=y
 CONFIG_CBE_RAS=y
 CONFIG_CBE_THERM=m
 CONFIG_CBE_CPUFREQ=m
+CONFIG_CBE_CPUFREQ_PMI=m
 # CONFIG_PQ2ADS is not set
 CONFIG_PPC_NATIVE=y
 CONFIG_UDBG_RTAS_CONSOLE=y
@@ -183,7 +181,7 @@ CONFIG_PPC_RTAS=y
 # CONFIG_RTAS_ERROR_LOGGING is not set
 CONFIG_RTAS_PROC=y
 CONFIG_RTAS_FLASH=y
-# CONFIG_PPC_PMI is not set
+CONFIG_PPC_PMI=m
 CONFIG_MMIO_NVRAM=y
 # CONFIG_PPC_MPC106 is not set
 # CONFIG_PPC_970_NAP is not set
@@ -206,6 +204,8 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 # CPU Frequency drivers
 #
 # CONFIG_CPM2 is not set
+CONFIG_AXON_RAM=m
+# CONFIG_FSL_ULI1575 is not set
 
 #
 # Kernel options
@@ -248,6 +248,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_MIGRATION=y
 CONFIG_RESOURCES_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
 CONFIG_ARCH_MEMORY_PRO

[POWERPC] axonram: Module modification for latest firmware API changes

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=fedcd2c53d838e7a69df699ce2a14e45d34d7f7f
Commit: fedcd2c53d838e7a69df699ce2a14e45d34d7f7f
Parent: 3addf55c9415f9da039947b33d064332137e49fe
Author: Maxim Shchetynin <[EMAIL PROTECTED]>
AuthorDate: Thu Aug 23 03:01:27 2007 +1000
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 16:58:27 2007 +1000

[POWERPC] axonram: Module modification for latest firmware API changes

Firmware would not deliver two interrupt numbers in device-tree any more
but only one, for correctable ECC, because uncorrectable ECC from now
is handled by firmware itself.
Changes in the axonram module are necessary because in the old version, if
it is not allowed to fetch the second interrupt number from device-tree,
it interpretes this as an error case and exits.

Signed-off-by: Maximilian <[EMAIL PROTECTED]>
Signed-off-by: Arnd Bergmann <[EMAIL PROTECTED]>
Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 arch/powerpc/sysdev/axonram.c |   43 ++--
 1 files changed, 11 insertions(+), 32 deletions(-)

diff --git a/arch/powerpc/sysdev/axonram.c b/arch/powerpc/sysdev/axonram.c
index 2326d5d..eabbf82 100644
--- a/arch/powerpc/sysdev/axonram.c
+++ b/arch/powerpc/sysdev/axonram.c
@@ -59,8 +59,7 @@
 struct axon_ram_bank {
struct of_device*device;
struct gendisk  *disk;
-   unsigned intirq_correctable;
-   unsigned intirq_uncorrectable;
+   unsigned intirq_id;
unsigned long   ph_addr;
unsigned long   io_addr;
unsigned long   size;
@@ -93,16 +92,9 @@ axon_ram_irq_handler(int irq, void *dev)
 
BUG_ON(!bank);
 
-   if (irq == bank->irq_correctable) {
-   dev_err(&device->dev, "Correctable memory error occured\n");
-   bank->ecc_counter++;
-   return IRQ_HANDLED;
-   } else if (irq == bank->irq_uncorrectable) {
-   dev_err(&device->dev, "Uncorrectable memory error occured\n");
-   panic("Critical ECC error on %s", device->node->full_name);
-   }
-
-   return IRQ_NONE;
+   dev_err(&device->dev, "Correctable memory error occured\n");
+   bank->ecc_counter++;
+   return IRQ_HANDLED;
 }
 
 /**
@@ -259,28 +251,18 @@ axon_ram_probe(struct of_device *device, const struct 
of_device_id *device_id)
blk_queue_hardsect_size(bank->disk->queue, AXON_RAM_SECTOR_SIZE);
add_disk(bank->disk);
 
-   bank->irq_correctable = irq_of_parse_and_map(device->node, 0);
-   bank->irq_uncorrectable = irq_of_parse_and_map(device->node, 1);
-   if ((bank->irq_correctable <= 0) || (bank->irq_uncorrectable <= 0)) {
+   bank->irq_id = irq_of_parse_and_map(device->node, 0);
+   if (bank->irq_id == NO_IRQ) {
dev_err(&device->dev, "Cannot access ECC interrupt ID\n");
rc = -EFAULT;
goto failed;
}
 
-   rc = request_irq(bank->irq_correctable, axon_ram_irq_handler,
-   AXON_RAM_IRQ_FLAGS, bank->disk->disk_name, device);
-   if (rc != 0) {
-   dev_err(&device->dev, "Cannot register ECC interrupt 
handler\n");
-   bank->irq_correctable = bank->irq_uncorrectable = 0;
-   rc = -EFAULT;
-   goto failed;
-   }
-
-   rc = request_irq(bank->irq_uncorrectable, axon_ram_irq_handler,
+   rc = request_irq(bank->irq_id, axon_ram_irq_handler,
AXON_RAM_IRQ_FLAGS, bank->disk->disk_name, device);
if (rc != 0) {
dev_err(&device->dev, "Cannot register ECC interrupt 
handler\n");
-   bank->irq_uncorrectable = 0;
+   bank->irq_id = NO_IRQ;
rc = -EFAULT;
goto failed;
}
@@ -296,10 +278,8 @@ axon_ram_probe(struct of_device *device, const struct 
of_device_id *device_id)
 
 failed:
if (bank != NULL) {
-   if (bank->irq_uncorrectable > 0)
-   free_irq(bank->irq_uncorrectable, device);
-   if (bank->irq_correctable > 0)
-   free_irq(bank->irq_correctable, device);
+   if (bank->irq_id != NO_IRQ)
+   free_irq(bank->irq_id, device);
if (bank->disk != NULL) {
if (bank->disk->queue != NULL)
blk_cleanup_queue(bank->disk->queue);
@@ -329,8 +309,7 @@ axon_ram_remove(struct of_device *device)
BUG_ON(!bank || !bank->disk);
 
device_remove_file(&device->dev, &dev_attr_ecc);
-   free_irq(bank->irq_uncorrectable, device);
-   free_irq(bank->irq_correctable, device);
+   free_irq(bank->irq_id, device);
blk_cleanup_queue(bank->disk->queue);
unregister_blkdev(bank->disk->major, bank->disk->disk_name)

[POWERPC] spu_manage: Use newer physical-id attribute

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=fa7f374bbf6d8e5fc7dd281a62498041066aaf43
Commit: fa7f374bbf6d8e5fc7dd281a62498041066aaf43
Parent: dfa70f81a05fa857fb1428ac2a88da84ecd50dd9
Author: Christian Krafft <[EMAIL PROTECTED]>
AuthorDate: Thu Aug 23 03:01:25 2007 +1000
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 16:58:26 2007 +1000

[POWERPC] spu_manage: Use newer physical-id attribute

Legacy device tree used the reg property for the physical id of an
spe.  On newer device tree layouts the reg property contains the
"correct" value in the reg attribute.  So there has been intoduced the
"physical-id" on newer devicetree layouts.  The id is stored by
spu_manage into the spu struct as spe_id.  cbe_thermal has been
changed to use the spu->spe_id.  There's no need for the thermal code
to check devicetree attributes for itself.

Signed-off-by: Christian Krafft <[EMAIL PROTECTED]>
Cc: Jeremy Kerr <[EMAIL PROTECTED]>
Signed-off-by: Arnd Bergmann <[EMAIL PROTECTED]>
Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 arch/powerpc/platforms/cell/cbe_thermal.c |6 +-
 arch/powerpc/platforms/cell/spu_manage.c  |2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/arch/powerpc/platforms/cell/cbe_thermal.c 
b/arch/powerpc/platforms/cell/cbe_thermal.c
index e4132f8..fb5eda4 100644
--- a/arch/powerpc/platforms/cell/cbe_thermal.c
+++ b/arch/powerpc/platforms/cell/cbe_thermal.c
@@ -88,17 +88,13 @@ static struct cbe_pmd_regs __iomem *get_pmd_regs(struct 
sys_device *sysdev)
 /* returns the value for a given spu in a given register */
 static u8 spu_read_register_value(struct sys_device *sysdev, union spe_reg 
__iomem *reg)
 {
-   const unsigned int *id;
union spe_reg value;
struct spu *spu;
 
-   /* getting the id from the reg attribute will not work on future 
device-tree layouts
-* in future we should store the id to the spu struct and use it here */
spu = container_of(sysdev, struct spu, sysdev);
-   id = of_get_property(spu_devnode(spu), "reg", NULL);
value.val = in_be64(®->val);
 
-   return value.spe[*id];
+   return value.spe[spu->spe_id];
 }
 
 static ssize_t spu_show_temp(struct sys_device *sysdev, char *buf)
diff --git a/arch/powerpc/platforms/cell/spu_manage.c 
b/arch/powerpc/platforms/cell/spu_manage.c
index 5eb8834..7c0668a 100644
--- a/arch/powerpc/platforms/cell/spu_manage.c
+++ b/arch/powerpc/platforms/cell/spu_manage.c
@@ -48,7 +48,7 @@ static u64 __init find_spu_unit_number(struct device_node 
*spe)
 {
const unsigned int *prop;
int proplen;
-   prop = of_get_property(spe, "unit-id", &proplen);
+   prop = of_get_property(spe, "physical-id", &proplen);
if (proplen == 4)
return (u64)*prop;
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PARISC] Add NOTES section

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=81b4b98ae484f11d97b3d5b8e88d916b74055b78
Commit: 81b4b98ae484f11d97b3d5b8e88d916b74055b78
Parent: 88a79078f9ca7d84736799605ff9d9e9545f18e7
Author: Kyle McMartin <[EMAIL PROTECTED]>
AuthorDate: Sun Aug 26 23:28:34 2007 -0400
Committer:  Kyle McMartin <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 00:29:25 2007 -0400

[PARISC] Add NOTES section

Bisected bizarre kernel-space nullptr dereference in udev to commit
18991197b4b588255ccabf472ebc84db7b66a19c, adding the NOTES section fixes
it.

Signed-off-by: Kyle McMartin <[EMAIL PROTECTED]>
---
 arch/parisc/kernel/vmlinux.lds.S |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S
index d4e6a93..ee7a16e 100644
--- a/arch/parisc/kernel/vmlinux.lds.S
+++ b/arch/parisc/kernel/vmlinux.lds.S
@@ -81,6 +81,8 @@ SECTIONS
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
 
+  NOTES
+
   __start___unwind = .; /* unwind info */
   .PARISC.unwind : { *(.PARISC.unwind) }
   __stop___unwind = .;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PARISC] Clean up sti_flush

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=03b18f1b2afeac76840648b4232d8e53cfb7ec84
Commit: 03b18f1b2afeac76840648b4232d8e53cfb7ec84
Parent: fabb8ff4ffa2b6bf89df8ed598551b6aaf632478
Author: Kyle McMartin <[EMAIL PROTECTED]>
AuthorDate: Fri Jun 29 02:17:50 2007 -0400
Committer:  Kyle McMartin <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 00:29:23 2007 -0400

[PARISC] Clean up sti_flush

sti_flush is supposed to flush the caches so we can execute the STI rom
we copied to memory. Anything more than flush_icache_range is overkill.

Fixes a missing symbol when built as a module.

Signed-off-by: Kyle McMartin <[EMAIL PROTECTED]>
---
 drivers/video/console/sticore.c |   14 +-
 1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c
index 870017d..e9ab657 100644
--- a/drivers/video/console/sticore.c
+++ b/drivers/video/console/sticore.c
@@ -232,18 +232,14 @@ sti_bmove(struct sti_struct *sti, int src_y, int src_x,
 }
 
 
-/* FIXME: Do we have another solution for this ? */
-static void sti_flush(unsigned long from, unsigned long len)
+static void sti_flush(unsigned long start, unsigned long end)
 {
-   flush_data_cache();
-   flush_kernel_dcache_range(from, len);
-   flush_icache_range(from, from+len);
+   flush_icache_range(start, end);
 }
 
 void __devinit
 sti_rom_copy(unsigned long base, unsigned long count, void *dest)
 {
-   unsigned long dest_len = count;
unsigned long dest_start = (unsigned long) dest;
 
/* this still needs to be revisited (see arch/parisc/mm/init.c:246) ! */
@@ -260,7 +256,7 @@ sti_rom_copy(unsigned long base, unsigned long count, void 
*dest)
dest++;
}
 
-   sti_flush(dest_start, dest_len);
+   sti_flush(dest_start, (unsigned long)dest);
 }
 
 
@@ -663,7 +659,6 @@ sti_bmode_font_raw(struct sti_cooked_font *f)
 static void __devinit
 sti_bmode_rom_copy(unsigned long base, unsigned long count, void *dest)
 {
-   unsigned long dest_len = count;
unsigned long dest_start = (unsigned long) dest;
 
while (count) {
@@ -672,7 +667,8 @@ sti_bmode_rom_copy(unsigned long base, unsigned long count, 
void *dest)
base += 4;
dest++;
}
-   sti_flush(dest_start, dest_len);
+
+   sti_flush(dest_start, (unsigned long)dest);
 }
 
 static struct sti_rom * __devinit
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PARISC] Add dummy isa_(bus|virt)_to_(virt|bus) inlines

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=fabb8ff4ffa2b6bf89df8ed598551b6aaf632478
Commit: fabb8ff4ffa2b6bf89df8ed598551b6aaf632478
Parent: 37efbb705a7c8778c5ee9f4ec6493cf2d958eecd
Author: Kyle McMartin <[EMAIL PROTECTED]>
AuthorDate: Fri Jun 29 02:21:03 2007 -0400
Committer:  Kyle McMartin <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 00:29:22 2007 -0400

[PARISC] Add dummy isa_(bus|virt)_to_(virt|bus) inlines

Less painful than fixing up the Kconfig for a pile of drivers to only build
on X86 && ARM && MIPS...

Just make them BUG(), as defining them to be 1:1 with physical memory will
likely HPMC the box anyways.

Signed-off-by: Kyle McMartin <[EMAIL PROTECTED]>
---
 include/asm-parisc/io.h |   10 ++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/include/asm-parisc/io.h b/include/asm-parisc/io.h
index c0fed91..4cc9bce 100644
--- a/include/asm-parisc/io.h
+++ b/include/asm-parisc/io.h
@@ -15,6 +15,16 @@ extern unsigned long parisc_vmerge_max_size;
 #define virt_to_bus virt_to_phys
 #define bus_to_virt phys_to_virt
 
+static inline unsigned long isa_bus_to_virt(unsigned long addr) {
+   BUG();
+   return 0;
+}
+
+static inline unsigned long isa_virt_to_bus(void *addr) {
+   BUG();
+   return 0;
+}
+
 /*
  * Memory mapped I/O
  *
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[MIPS] Cleanup TX39/TX49 irq code

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c87abd75b35e8f991ff8ff1510d6fb62612c61fa
Commit: c87abd75b35e8f991ff8ff1510d6fb62612c61fa
Parent: 8420fd00e88ef4f6082866aa151bc753b006b3b6
Author: Atsushi Nemoto <[EMAIL PROTECTED]>
AuthorDate: Thu Aug 2 23:36:02 2007 +0900
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:53 2007 +0100

[MIPS] Cleanup TX39/TX49 irq code

Cleanup jmr3927, tx4927 and tx4938 irq codes, using common IRQ_CPU,
I8259 and IRQ_TXX9 irq routines.

Signed-off-by: Atsushi Nemoto <[EMAIL PROTECTED]>
Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/Kconfig  |8 +-
 arch/mips/jmr3927/rbhma3100/irq.c  |   48 +---
 arch/mips/jmr3927/rbhma3100/setup.c|   13 -
 arch/mips/tx4927/common/tx4927_irq.c   |  395 +---
 .../tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c |  171 +
 .../toshiba_rbtx4927/toshiba_rbtx4927_setup.c  |   11 +-
 arch/mips/tx4938/common/irq.c  |  279 +-
 arch/mips/tx4938/toshiba_rbtx4938/irq.c|2 +-
 arch/mips/tx4938/toshiba_rbtx4938/setup.c  |9 +-
 include/asm-mips/jmr3927/jmr3927.h |3 +-
 include/asm-mips/jmr3927/tx3927.h  |   36 --
 include/asm-mips/tx4927/toshiba_rbtx4927.h |2 +-
 include/asm-mips/tx4927/tx4927.h   |   49 +---
 include/asm-mips/tx4927/tx4927_pci.h   |   23 +--
 include/asm-mips/tx4938/rbtx4938.h |   25 +-
 include/asm-mips/tx4938/tx4938.h   |   41 --
 16 files changed, 55 insertions(+), 1060 deletions(-)

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index cec0d84..4b02d8a 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -528,6 +528,7 @@ config TOSHIBA_JMR3927
select DMA_NONCOHERENT
select HW_HAS_PCI
select MIPS_TX3927
+   select IRQ_TXX9
select SWAP_IO_SPACE
select SYS_HAS_CPU_TX39XX
select SYS_SUPPORTS_32BIT_KERNEL
@@ -540,7 +541,9 @@ config TOSHIBA_RBTX4927
select DMA_NONCOHERENT
select HAS_TXX9_SERIAL
select HW_HAS_PCI
-   select I8259
+   select IRQ_CPU
+   select IRQ_TXX9
+   select I8259 if TOSHIBA_FPCIB0
select SWAP_IO_SPACE
select SYS_HAS_CPU_TX49XX
select SYS_SUPPORTS_32BIT_KERNEL
@@ -560,7 +563,8 @@ config TOSHIBA_RBTX4938
select GENERIC_ISA_DMA
select HAS_TXX9_SERIAL
select HW_HAS_PCI
-   select I8259
+   select IRQ_CPU
+   select IRQ_TXX9
select SWAP_IO_SPACE
select SYS_HAS_CPU_TX49XX
select SYS_SUPPORTS_32BIT_KERNEL
diff --git a/arch/mips/jmr3927/rbhma3100/irq.c 
b/arch/mips/jmr3927/rbhma3100/irq.c
index 1187b44..d9efe69 100644
--- a/arch/mips/jmr3927/rbhma3100/irq.c
+++ b/arch/mips/jmr3927/rbhma3100/irq.c
@@ -45,9 +45,6 @@
 #error JMR3927_IRQ_END > NR_IRQS
 #endif
 
-#define irc_dlevel 0
-#define irc_elevel 1
-
 static unsigned char irc_level[TX3927_NUM_IR] = {
5, 5, 5, 5, 5, 5,   /* INT[5:0] */
7, 7,   /* SIO */
@@ -80,34 +77,6 @@ static void unmask_irq_ioc(unsigned int irq)
(void)jmr3927_ioc_reg_in(JMR3927_IOC_REV_ADDR);
 }
 
-static void mask_irq_irc(unsigned int irq)
-{
-   unsigned int irq_nr = irq - JMR3927_IRQ_IRC;
-   volatile unsigned long *ilrp = &tx3927_ircptr->ilr[irq_nr / 2];
-   if (irq_nr & 1)
-   *ilrp = (*ilrp & 0x00ff) | (irc_dlevel << 8);
-   else
-   *ilrp = (*ilrp & 0xff00) | irc_dlevel;
-   /* update IRCSR */
-   tx3927_ircptr->imr = 0;
-   tx3927_ircptr->imr = irc_elevel;
-   /* flush write buffer */
-   (void)tx3927_ircptr->ssr;
-}
-
-static void unmask_irq_irc(unsigned int irq)
-{
-   unsigned int irq_nr = irq - JMR3927_IRQ_IRC;
-   volatile unsigned long *ilrp = &tx3927_ircptr->ilr[irq_nr / 2];
-   if (irq_nr & 1)
-   *ilrp = (*ilrp & 0x00ff) | (irc_level[irq_nr] << 8);
-   else
-   *ilrp = (*ilrp & 0xff00) | irc_level[irq_nr];
-   /* update IRCSR */
-   tx3927_ircptr->imr = 0;
-   tx3927_ircptr->imr = irc_elevel;
-}
-
 asmlinkage void plat_irq_dispatch(void)
 {
unsigned long cp0_cause = read_c0_cause();
@@ -168,10 +137,6 @@ void __init arch_init_irq(void)
/* clear PCI Reset interrupts */
jmr3927_ioc_reg_out(0, JMR3927_IOC_RESET_ADDR);
 
-   /* enable interrupt control */
-   tx3927_ircptr->cer = TX3927_IRCER_ICE;
-   tx3927_ircptr->imr = irc_elevel;
-
jmr3927_irq_init();
 
/* setup IOC interrupt 1 (PCI, MODEM) */
@@ -193,20 +158,13 @@ static struct irq_chip jmr3927_irq_ioc = {
.unmask = unmask_irq_ioc,
 };
 
-static struct irq_chip jmr3927_irq_irc = {
-   .name = "jmr3927_irc",
-   .ack = mask_irq_irc,
-   .m

[MIPS] Drop unneeded config options for RBTX4938

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ad99876ad4309c6d9db1fb47d3e0b78f5d959896
Commit: ad99876ad4309c6d9db1fb47d3e0b78f5d959896
Parent: c87abd75b35e8f991ff8ff1510d6fb62612c61fa
Author: Atsushi Nemoto <[EMAIL PROTECTED]>
AuthorDate: Thu Aug 2 23:36:11 2007 +0900
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:53 2007 +0100

[MIPS] Drop unneeded config options for RBTX4938

Signed-off-by: Atsushi Nemoto <[EMAIL PROTECTED]>
Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/Kconfig |2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 4b02d8a..e7d542d 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -558,9 +558,7 @@ config TOSHIBA_RBTX4927
 
 config TOSHIBA_RBTX4938
bool "Toshiba RBTX4938 board"
-   select HAVE_STD_PC_SERIAL_PORT
select DMA_NONCOHERENT
-   select GENERIC_ISA_DMA
select HAS_TXX9_SERIAL
select HW_HAS_PCI
select IRQ_CPU
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[MIPS] Use -Werror on TX39/TX49 boards

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=cd463f3483bf7ddebfaade4a0e590478d501b896
Commit: cd463f3483bf7ddebfaade4a0e590478d501b896
Parent: ad99876ad4309c6d9db1fb47d3e0b78f5d959896
Author: Atsushi Nemoto <[EMAIL PROTECTED]>
AuthorDate: Thu Aug 2 23:36:17 2007 +0900
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:53 2007 +0100

[MIPS] Use -Werror on TX39/TX49 boards

Now these directories can be built cleanly.

Signed-off-by: Atsushi Nemoto <[EMAIL PROTECTED]>
Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/tx4927/common/Makefile   |2 ++
 arch/mips/tx4927/toshiba_rbtx4927/Makefile |2 ++
 arch/mips/tx4938/common/Makefile   |1 +
 arch/mips/tx4938/toshiba_rbtx4938/Makefile |2 ++
 4 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/arch/mips/tx4927/common/Makefile b/arch/mips/tx4927/common/Makefile
index 9cb9535..1837578 100644
--- a/arch/mips/tx4927/common/Makefile
+++ b/arch/mips/tx4927/common/Makefile
@@ -10,3 +10,5 @@ obj-y += tx4927_prom.o tx4927_setup.o tx4927_irq.o
 
 obj-$(CONFIG_TOSHIBA_FPCIB0)  += smsc_fdc37m81x.o
 obj-$(CONFIG_KGDB) += tx4927_dbgio.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/Makefile 
b/arch/mips/tx4927/toshiba_rbtx4927/Makefile
index 8a991f3..13f9672 100644
--- a/arch/mips/tx4927/toshiba_rbtx4927/Makefile
+++ b/arch/mips/tx4927/toshiba_rbtx4927/Makefile
@@ -1,3 +1,5 @@
 obj-y  += toshiba_rbtx4927_prom.o
 obj-y  += toshiba_rbtx4927_setup.o
 obj-y  += toshiba_rbtx4927_irq.o
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/tx4938/common/Makefile b/arch/mips/tx4938/common/Makefile
index 83cda51..8352eca 100644
--- a/arch/mips/tx4938/common/Makefile
+++ b/arch/mips/tx4938/common/Makefile
@@ -9,3 +9,4 @@
 obj-y  += prom.o setup.o irq.o
 obj-$(CONFIG_KGDB) += dbgio.o
 
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/Makefile 
b/arch/mips/tx4938/toshiba_rbtx4938/Makefile
index 10c94e6..675bb1c 100644
--- a/arch/mips/tx4938/toshiba_rbtx4938/Makefile
+++ b/arch/mips/tx4938/toshiba_rbtx4938/Makefile
@@ -7,3 +7,5 @@
 #
 
 obj-y  += prom.o setup.o irq.o spi_eeprom.o
+
+EXTRA_CFLAGS += -Werror
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[MIPS] Update defconfigs for TX39/TX49

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=bda4d16cee1b70c61392bb76cb4119179348c176
Commit: bda4d16cee1b70c61392bb76cb4119179348c176
Parent: cd463f3483bf7ddebfaade4a0e590478d501b896
Author: Atsushi Nemoto <[EMAIL PROTECTED]>
AuthorDate: Thu Aug 2 23:36:26 2007 +0900
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:53 2007 +0100

[MIPS] Update defconfigs for TX39/TX49

Update defconfigs, disabling CONFIG_EXPERIMENTAL.

Signed-off-by: Atsushi Nemoto <[EMAIL PROTECTED]>
Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/configs/jmr3927_defconfig   |  396 +++--
 arch/mips/configs/rbhma4200_defconfig |  332 
 arch/mips/configs/rbhma4500_defconfig |  239 +++-
 3 files changed, 167 insertions(+), 800 deletions(-)

diff --git a/arch/mips/configs/jmr3927_defconfig 
b/arch/mips/configs/jmr3927_defconfig
index 95a72d2..eb96791 100644
--- a/arch/mips/configs/jmr3927_defconfig
+++ b/arch/mips/configs/jmr3927_defconfig
@@ -1,60 +1,47 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-rc3
-# Thu Mar 15 00:40:40 2007
+# Linux kernel version: 2.6.23-rc1
+# Thu Aug  2 23:07:36 2007
 #
 CONFIG_MIPS=y
 
 #
 # Machine selection
 #
-CONFIG_ZONE_DMA=y
-# CONFIG_MIPS_MTX1 is not set
-# CONFIG_MIPS_BOSPORUS is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_MIRAGE is not set
+# CONFIG_MACH_ALCHEMY is not set
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
+# CONFIG_LEMOTE_FULONG is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
-# CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
-# CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MIPS_XXS1500 is not set
+# CONFIG_MARKEINS is not set
+# CONFIG_MACH_VR41XX is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_MACH_VR41XX is not set
+# CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
-# CONFIG_MARKEINS is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_CARMEL is not set
 # CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_BIGSUR is not set
 # CONFIG_SNI_RM is not set
 CONFIG_TOSHIBA_JMR3927=y
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
+# CONFIG_WR_PPMC is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
@@ -66,10 +53,12 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
+# CONFIG_NO_IOPORT is not set
 CONFIG_CPU_BIG_ENDIAN=y
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
+CONFIG_IRQ_TXX9=y
 CONFIG_MIPS_TX3927=y
 CONFIG_SWAP_IO_SPACE=y
 CONFIG_MIPS_L1_CACHE_SHIFT=5
@@ -77,6 +66,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
 #
 # CPU selection
 #
+# CONFIG_CPU_LOONGSON2 is not set
 # CONFIG_CPU_MIPS32_R1 is not set
 # CONFIG_CPU_MIPS32_R2 is not set
 # CONFIG_CPU_MIPS64_R1 is not set
@@ -112,21 +102,17 @@ CONFIG_PAGE_SIZE_4KB=y
 CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_VPE_LOADER is not set
 CONFIG_CPU_HAS_SYNC=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_VIRT_TO_BUS=y
 # CONFIG_HZ_48 is not set
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_128 is not set
@@ -139,37 +125,30 @@ CONFIG_HZ=250
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
-# CONFIG_KEXEC is not set
+# CONFIG_SECCOMP is not set
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPO

[MIPS] Do not discard extra debugging sections.

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=6c76988b813ae7a9fa2282032effa6f5a66dd8d2
Commit: 6c76988b813ae7a9fa2282032effa6f5a66dd8d2
Parent: bda4d16cee1b70c61392bb76cb4119179348c176
Author: Daniel Jacobowitz <[EMAIL PROTECTED]>
AuthorDate: Fri Aug 3 11:43:01 2007 -0400
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:53 2007 +0100

[MIPS] Do not discard extra debugging sections.

Leaving these sections is useful to some tools that look at the image, and
none of them are loaded into memory.  The .mdebug.abi64 section, in
particular, lets GDB recognize vmlinux.32 as an N64 program instead of
guessing that it is O32.

Signed-off-by: Daniel Jacobowitz <[EMAIL PROTECTED]>
Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/kernel/vmlinux.lds.S |7 ---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
index bc9bae2..60bbaec 100644
--- a/arch/mips/kernel/vmlinux.lds.S
+++ b/arch/mips/kernel/vmlinux.lds.S
@@ -142,15 +142,16 @@ SECTIONS
 *(.exitcall.exit)
 
/* ABI crap starts here */
-   *(.comment)
*(.MIPS.options)
-   *(.note)
*(.options)
*(.pdr)
*(.reginfo)
-   *(.mdebug*)
   }
 
+  /* These mark the ABI of the kernel for debuggers.  */
+  .mdebug.abi32 : { KEEP(*(.mdebug.abi32)) }
+  .mdebug.abi64 : { KEEP(*(.mdebug.abi64)) }
+
   /* This is the MIPS specific mdebug section.  */
   .mdebug : { *(.mdebug) }
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[MIPS] Remove dead code from irq_txx9.c

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=5d3fdeacee5d071a5c3d674231bf00cfa5d35a7a
Commit: 5d3fdeacee5d071a5c3d674231bf00cfa5d35a7a
Parent: 6c76988b813ae7a9fa2282032effa6f5a66dd8d2
Author: Atsushi Nemoto <[EMAIL PROTECTED]>
AuthorDate: Fri Aug 3 23:33:38 2007 +0900
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:54 2007 +0100

[MIPS] Remove dead code from irq_txx9.c

Signed-off-by: Atsushi Nemoto <[EMAIL PROTECTED]>
Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/kernel/irq_txx9.c |   10 +++---
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/arch/mips/kernel/irq_txx9.c b/arch/mips/kernel/irq_txx9.c
index 172e14b..a4d1462 100644
--- a/arch/mips/kernel/irq_txx9.c
+++ b/arch/mips/kernel/irq_txx9.c
@@ -105,13 +105,9 @@ static void txx9_irq_mask_ack(unsigned int irq)
unsigned int irq_nr = irq - TXX9_IRQ_BASE;
 
txx9_irq_mask(irq);
-   if (TXx9_IRCR_EDGE(txx9irq[irq_nr].mode)) {
-   /* clear edge detection */
-   u32 cr = __raw_readl(&txx9_ircptr->cr[irq_nr / 8]);
-   cr = (cr >> ((irq_nr & (8 - 1)) * 2)) & 3;
-   __raw_writel(TXx9_IRSCR_EIClrE | irq_nr,
-&txx9_ircptr->scr);
-   }
+   /* clear edge detection */
+   if (unlikely(TXx9_IRCR_EDGE(txx9irq[irq_nr].mode)))
+   __raw_writel(TXx9_IRSCR_EIClrE | irq_nr, &txx9_ircptr->scr);
 }
 
 static int txx9_irq_set_type(unsigned int irq, unsigned int flow_type)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[MIPS] SNI: remove unused pcimt_scache.c

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e2286d755506afb5066740f251ae3bedc63f2ced
Commit: e2286d755506afb5066740f251ae3bedc63f2ced
Parent: dee3c75058485d55c8188a13d660d72188c5bcee
Author: Yoichi Yuasa <[EMAIL PROTECTED]>
AuthorDate: Sat Aug 4 23:26:53 2007 +0900
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:54 2007 +0100

[MIPS] SNI: remove unused pcimt_scache.c

Signed-off-by: Yoichi Yuasa <[EMAIL PROTECTED]>
Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/sni/pcimt_scache.c |   37 -
 include/asm-mips/bcache.h|1 -
 2 files changed, 0 insertions(+), 38 deletions(-)

diff --git a/arch/mips/sni/pcimt_scache.c b/arch/mips/sni/pcimt_scache.c
deleted file mode 100644
index a59d457..000
--- a/arch/mips/sni/pcimt_scache.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * arch/mips/sni/pcimt_scache.c
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (c) 1997, 1998 by Ralf Baechle
- */
-#include 
-#include 
-#include 
-#include 
-
-#define cacheconf (*(volatile unsigned int *)PCIMT_CACHECONF)
-#define invspace (*(volatile unsigned int *)PCIMT_INVSPACE)
-
-void __init sni_pcimt_sc_init(void)
-{
-   unsigned int scsiz, sc_size;
-
-   scsiz = cacheconf & 7;
-   if (scsiz == 0) {
-   printk("Second level cache is deactived.\n");
-   return;
-   }
-   if (scsiz >= 6) {
-   printk("Invalid second level cache size configured, "
-  "deactivating second level cache.\n");
-   cacheconf = 0;
-   return;
-   }
-
-   sc_size = 128 << scsiz;
-   printk("%dkb second level cache detected, deactivating.\n", sc_size);
-   cacheconf = 0;
-}
diff --git a/include/asm-mips/bcache.h b/include/asm-mips/bcache.h
index 3646a3f..0ba9d6e 100644
--- a/include/asm-mips/bcache.h
+++ b/include/asm-mips/bcache.h
@@ -21,7 +21,6 @@ struct bcache_ops {
 };
 
 extern void indy_sc_init(void);
-extern void sni_pcimt_sc_init(void);
 
 #ifdef CONFIG_BOARD_SCACHE
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[MIPS] remove unused gt64240.h

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=106e8028ce81305b93dfd6b809c196d62910feae
Commit: 106e8028ce81305b93dfd6b809c196d62910feae
Parent: e2286d755506afb5066740f251ae3bedc63f2ced
Author: Yoichi Yuasa <[EMAIL PROTECTED]>
AuthorDate: Sat Aug 4 23:34:17 2007 +0900
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:54 2007 +0100

[MIPS] remove unused gt64240.h

Signed-off-by: Yoichi Yuasa <[EMAIL PROTECTED]>
Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 include/asm-mips/gt64240.h | 1235 
 1 files changed, 0 insertions(+), 1235 deletions(-)

diff --git a/include/asm-mips/gt64240.h b/include/asm-mips/gt64240.h
deleted file mode 100644
index 8f9bd34..000
--- a/include/asm-mips/gt64240.h
+++ /dev/null
@@ -1,1235 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright - Galileo technology.
- * Copyright (C) 2004 by Ralf Baechle
- */
-#ifndef __ASM_MIPS_MV64240_H
-#define __ASM_MIPS_MV64240_H
-
-#include 
-#include 
-
-/*
- * CPU Control Registers
- */
-
-#define CPU_CONFIGURATION  0x000
-#define CPU_MODE   0x120
-#define CPU_READ_RESPONSE_CROSSBAR_LOW 0x170
-#define CPU_READ_RESPONSE_CROSSBAR_HIGH0x178
-
-/*
- * Processor Address Space
- */
-
-/* Sdram's BAR'S */
-#define SCS_0_LOW_DECODE_ADDRESS   0x008
-#define SCS_0_HIGH_DECODE_ADDRESS  0x010
-#define SCS_1_LOW_DECODE_ADDRESS   0x208
-#define SCS_1_HIGH_DECODE_ADDRESS  0x210
-#define SCS_2_LOW_DECODE_ADDRESS   0x018
-#define SCS_2_HIGH_DECODE_ADDRESS  0x020
-#define SCS_3_LOW_DECODE_ADDRESS   0x218
-#define SCS_3_HIGH_DECODE_ADDRESS  0x220
-/* Devices BAR'S */
-#define CS_0_LOW_DECODE_ADDRESS0x028
-#define CS_0_HIGH_DECODE_ADDRESS   0x030
-#define CS_1_LOW_DECODE_ADDRESS0x228
-#define CS_1_HIGH_DECODE_ADDRESS   0x230
-#define CS_2_LOW_DECODE_ADDRESS0x248
-#define CS_2_HIGH_DECODE_ADDRESS   0x250
-#define CS_3_LOW_DECODE_ADDRESS0x038
-#define CS_3_HIGH_DECODE_ADDRESS   0x040
-#define BOOTCS_LOW_DECODE_ADDRESS  0x238
-#define BOOTCS_HIGH_DECODE_ADDRESS 0x240
-
-#define PCI_0I_O_LOW_DECODE_ADDRESS0x048
-#define PCI_0I_O_HIGH_DECODE_ADDRESS   0x050
-#define PCI_0MEMORY0_LOW_DECODE_ADDRESS0x058
-#define PCI_0MEMORY0_HIGH_DECODE_ADDRESS   0x060
-#define PCI_0MEMORY1_LOW_DECODE_ADDRESS0x080
-#define PCI_0MEMORY1_HIGH_DECODE_ADDRESS   0x088
-#define PCI_0MEMORY2_LOW_DECODE_ADDRESS0x258
-#define PCI_0MEMORY2_HIGH_DECODE_ADDRESS   0x260
-#define PCI_0MEMORY3_LOW_DECODE_ADDRESS0x280
-#define PCI_0MEMORY3_HIGH_DECODE_ADDRESS   0x288
-
-#define PCI_1I_O_LOW_DECODE_ADDRESS0x090
-#define PCI_1I_O_HIGH_DECODE_ADDRESS   0x098
-#define PCI_1MEMORY0_LOW_DECODE_ADDRESS0x0a0
-#define PCI_1MEMORY0_HIGH_DECODE_ADDRESS   0x0a8
-#define PCI_1MEMORY1_LOW_DECODE_ADDRESS0x0b0
-#define PCI_1MEMORY1_HIGH_DECODE_ADDRESS   0x0b8
-#define PCI_1MEMORY2_LOW_DECODE_ADDRESS0x2a0
-#define PCI_1MEMORY2_HIGH_DECODE_ADDRESS   0x2a8
-#define PCI_1MEMORY3_LOW_DECODE_ADDRESS0x2b0
-#define PCI_1MEMORY3_HIGH_DECODE_ADDRESS   0x2b8
-
-#define INTERNAL_SPACE_DECODE  0x068
-
-#define CPU_0_LOW_DECODE_ADDRESS   0x290
-#define CPU_0_HIGH_DECODE_ADDRESS  0x298
-#define CPU_1_LOW_DECODE_ADDRESS   0x2c0
-#define CPU_1_HIGH_DECODE_ADDRESS  0x2c8
-
-#define PCI_0I_O_ADDRESS_REMAP 0x0f0
-#define PCI_0MEMORY0_ADDRESS_REMAP 0x0f8
-#define PCI_0MEMORY0_HIGH_ADDRESS_REMAP0x320
-#define PCI_0MEMORY1_ADDR

[PARISC] Add empty

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=37efbb705a7c8778c5ee9f4ec6493cf2d958eecd
Commit: 37efbb705a7c8778c5ee9f4ec6493cf2d958eecd
Parent: 39d3520c92cf7a28c07229ca00cc35a1e8026c77
Author: Kyle McMartin <[EMAIL PROTECTED]>
AuthorDate: Thu Jun 28 12:12:39 2007 -0400
Committer:  Kyle McMartin <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 00:29:22 2007 -0400

[PARISC] Add empty 

Signed-off-by: Kyle McMartin <[EMAIL PROTECTED]>
---
 include/asm-parisc/vga.h |6 ++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/include/asm-parisc/vga.h b/include/asm-parisc/vga.h
new file mode 100644
index 000..154a84c
--- /dev/null
+++ b/include/asm-parisc/vga.h
@@ -0,0 +1,6 @@
+#ifndef __ASM_PARISC_VGA_H__
+#define __ASM_PARISC_VGA_H__
+
+/* nothing */
+
+#endif __ASM_PARISC_VGA_H__
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PARISC] Do not allow STI_CONSOLE to be modular

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=1eb51c362d5e7b3e2cc741d87872aa4fc867de42
Commit: 1eb51c362d5e7b3e2cc741d87872aa4fc867de42
Parent: 03b18f1b2afeac76840648b4232d8e53cfb7ec84
Author: Kyle McMartin <[EMAIL PROTECTED]>
AuthorDate: Fri Jun 29 02:15:12 2007 -0400
Committer:  Kyle McMartin <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 00:29:24 2007 -0400

[PARISC] Do not allow STI_CONSOLE to be modular

It doesn't really make much sense, anyways, and would need a pile of
symbols exported.

Signed-off-by: Kyle McMartin <[EMAIL PROTECTED]>
---
 drivers/video/console/Kconfig |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index 4964396..5db6b1e 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -145,7 +145,7 @@ config FRAMEBUFFER_CONSOLE_ROTATION
  oriented.
 
 config STI_CONSOLE
-tristate "STI text console" 
+bool "STI text console"
 depends on PARISC
 default y
 help
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PARISC] Use compat_sys_getdents

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=88a79078f9ca7d84736799605ff9d9e9545f18e7
Commit: 88a79078f9ca7d84736799605ff9d9e9545f18e7
Parent: 1eb51c362d5e7b3e2cc741d87872aa4fc867de42
Author: Kyle McMartin <[EMAIL PROTECTED]>
AuthorDate: Fri Jun 29 03:38:10 2007 -0400
Committer:  Kyle McMartin <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 00:29:25 2007 -0400

[PARISC] Use compat_sys_getdents

Switch to using the generic compat_sys_getdents instead of a
homebrew one.

Signed-off-by: Kyle McMartin <[EMAIL PROTECTED]>
---
 arch/parisc/kernel/sys_parisc32.c  |  141 
 arch/parisc/kernel/syscall_table.S |4 +-
 2 files changed, 1 insertions(+), 144 deletions(-)

diff --git a/arch/parisc/kernel/sys_parisc32.c 
b/arch/parisc/kernel/sys_parisc32.c
index bb23ff7..2989c66 100644
--- a/arch/parisc/kernel/sys_parisc32.c
+++ b/arch/parisc/kernel/sys_parisc32.c
@@ -285,147 +285,6 @@ int cp_compat_stat(struct kstat *stat, struct compat_stat 
__user *statbuf)
return err;
 }
 
-struct linux32_dirent {
-   u32 d_ino;
-   compat_off_td_off;
-   u16 d_reclen;
-   chard_name[1];
-};
-
-struct old_linux32_dirent {
-   u32 d_ino;
-   u32 d_offset;
-   u16 d_namlen;
-   chard_name[1];
-};
-
-struct getdents32_callback {
-   struct linux32_dirent __user * current_dir;
-   struct linux32_dirent __user * previous;
-   int count;
-   int error;
-};
-
-struct readdir32_callback {
-   struct old_linux32_dirent __user * dirent;
-   int count;
-};
-
-#define NAME_OFFSET(de) ((int) ((de)->d_name - (char __user *) (de)))
-static int filldir32 (void *__buf, const char *name, int namlen,
-   loff_t offset, u64 ino, unsigned int d_type)
-{
-   struct linux32_dirent __user * dirent;
-   struct getdents32_callback * buf = (struct getdents32_callback *) __buf;
-   int reclen = ALIGN(NAME_OFFSET(dirent) + namlen + 1, 4);
-   u32 d_ino;
-
-   buf->error = -EINVAL;   /* only used if we fail.. */
-   if (reclen > buf->count)
-   return -EINVAL;
-   d_ino = ino;
-   if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
-   return -EOVERFLOW;
-   dirent = buf->previous;
-   if (dirent)
-   put_user(offset, &dirent->d_off);
-   dirent = buf->current_dir;
-   buf->previous = dirent;
-   put_user(d_ino, &dirent->d_ino);
-   put_user(reclen, &dirent->d_reclen);
-   copy_to_user(dirent->d_name, name, namlen);
-   put_user(0, dirent->d_name + namlen);
-   dirent = ((void __user *)dirent) + reclen;
-   buf->current_dir = dirent;
-   buf->count -= reclen;
-   return 0;
-}
-
-asmlinkage long
-sys32_getdents (unsigned int fd, void __user * dirent, unsigned int count)
-{
-   struct file * file;
-   struct linux32_dirent __user * lastdirent;
-   struct getdents32_callback buf;
-   int error;
-
-   error = -EFAULT;
-   if (!access_ok(VERIFY_WRITE, dirent, count))
-   goto out;
-
-   error = -EBADF;
-   file = fget(fd);
-   if (!file)
-   goto out;
-
-   buf.current_dir = (struct linux32_dirent __user *) dirent;
-   buf.previous = NULL;
-   buf.count = count;
-   buf.error = 0;
-
-   error = vfs_readdir(file, filldir32, &buf);
-   if (error < 0)
-   goto out_putf;
-   error = buf.error;
-   lastdirent = buf.previous;
-   if (lastdirent) {
-   if (put_user(file->f_pos, &lastdirent->d_off))
-   error = -EFAULT;
-   else
-   error = count - buf.count;
-   }
-
-out_putf:
-   fput(file);
-out:
-   return error;
-}
-
-static int fillonedir32(void * __buf, const char * name, int namlen,
-   loff_t offset, u64 ino, unsigned int d_type)
-{
-   struct readdir32_callback * buf = (struct readdir32_callback *) __buf;
-   struct old_linux32_dirent __user * dirent;
-   u32 d_ino;
-
-   if (buf->count)
-   return -EINVAL;
-   d_ino = ino;
-   if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
-   return -EOVERFLOW;
-   buf->count++;
-   dirent = buf->dirent;
-   put_user(d_ino, &dirent->d_ino);
-   put_user(offset, &dirent->d_offset);
-   put_user(namlen, &dirent->d_namlen);
-   copy_to_user(dirent->d_name, name, namlen);
-   put_user(0, dirent->d_name + namlen);
-   return 0;
-}
-
-asmlinkage long
-sys32_readdir (unsigned int fd, void __user * dirent, unsigned int count)
-{
-   int error;
-   struct file * file;
-   struct readdir32_callback buf;
-
-   error = -EBADF;
-   file = fget(fd);
-   if (!file)
-   goto out;
-
-   buf.count = 0;
-   buf.dirent = dirent;
-
-   error = vfs_readdir(file,

[POWERPC] pasemi: Another IOMMU bugfix for 64K PAGE_SIZE

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=dfa70f81a05fa857fb1428ac2a88da84ecd50dd9
Commit: dfa70f81a05fa857fb1428ac2a88da84ecd50dd9
Parent: 1a8f46100b657f533ce677e79bc27c6794c91c46
Author: Olof Johansson <[EMAIL PROTECTED]>
AuthorDate: Fri Aug 17 13:57:39 2007 +1000
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 16:58:26 2007 +1000

[POWERPC] pasemi: Another IOMMU bugfix for 64K PAGE_SIZE

More fallout from the switch from PAGE_SIZE based IOMMU to the native page
size for the driver. By pure luck it happened to work most of the time, 
since
we end up invalidating the wrong entries in the TLB.

Signed-off-by: Olof Johansson <[EMAIL PROTECTED]>
Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 arch/powerpc/platforms/pasemi/iommu.c |6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/platforms/pasemi/iommu.c 
b/arch/powerpc/platforms/pasemi/iommu.c
index f33b21b..9014d55 100644
--- a/arch/powerpc/platforms/pasemi/iommu.c
+++ b/arch/powerpc/platforms/pasemi/iommu.c
@@ -93,7 +93,7 @@ static void iobmap_build(struct iommu_table *tbl, long index,
 
pr_debug("iobmap: build at: %lx, %lx, addr: %lx\n", index, npages, 
uaddr);
 
-   bus_addr = (tbl->it_offset + index) << PAGE_SHIFT;
+   bus_addr = (tbl->it_offset + index) << IOBMAP_PAGE_SHIFT;
 
ip = ((u32 *)tbl->it_base) + index;
 
@@ -118,7 +118,7 @@ static void iobmap_free(struct iommu_table *tbl, long index,
 
pr_debug("iobmap: free at: %lx, %lx\n", index, npages);
 
-   bus_addr = (tbl->it_offset + index) << PAGE_SHIFT;
+   bus_addr = (tbl->it_offset + index) << IOBMAP_PAGE_SHIFT;
 
ip = ((u32 *)tbl->it_base) + index;
 
@@ -137,7 +137,7 @@ static void iommu_table_iobmap_setup(void)
iommu_table_iobmap.it_busno = 0;
iommu_table_iobmap.it_offset = 0;
/* it_size is in number of entries */
-   iommu_table_iobmap.it_size = 0x8000 >> PAGE_SHIFT;
+   iommu_table_iobmap.it_size = 0x8000 >> IOBMAP_PAGE_SHIFT;
 
/* Initialize the common IOMMU code */
iommu_table_iobmap.it_base = (unsigned long)iob_l2_base;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[POWERPC] cell: Support pinhole-reset on IBM cell blades

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=3addf55c9415f9da039947b33d064332137e49fe
Commit: 3addf55c9415f9da039947b33d064332137e49fe
Parent: fa7f374bbf6d8e5fc7dd281a62498041066aaf43
Author: Arnd Bergmann <[EMAIL PROTECTED]>
AuthorDate: Thu Aug 23 03:01:26 2007 +1000
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 16:58:26 2007 +1000

[POWERPC] cell: Support pinhole-reset on IBM cell blades

The Cell Broadband Engine has a method of injecting a
system-reset-exception from an external source into the
operating system, which should trigger the regular behaviour
of entering xmon or kdump.

Unfortunately, the exception handler cannot distinguish it from
other interrupt causes by the SRR1 register, which gets used
for this on Power 6 and others.

IBM Blade servers that want to support triggering the
system reset exception using a pinhole button in the front
panel therefore use an extra register to determine the
reset cause.

Signed-off-by: Arnd Bergmann <[EMAIL PROTECTED]>

--
Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 arch/powerpc/platforms/cell/cbe_regs.h  |8 ++--
 arch/powerpc/platforms/cell/pervasive.c |   26 ++
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/platforms/cell/cbe_regs.h 
b/arch/powerpc/platforms/cell/cbe_regs.h
index 17d5971..b24025f 100644
--- a/arch/powerpc/platforms/cell/cbe_regs.h
+++ b/arch/powerpc/platforms/cell/cbe_regs.h
@@ -113,10 +113,14 @@ struct cbe_pmd_regs {
u64 checkstop_fir;  /* 0x0c00 */
u64 recoverable_fir;/* 0x0c08 */
u64 spec_att_mchk_fir;  /* 0x0c10 */
-   u64 fir_mode_reg;   /* 0x0c18 */
+   u32 fir_mode_reg;   /* 0x0c18 */
+   u8  pad_0x0c1c_0x0c20 [4];  /* 0x0c1c */
+#define CBE_PMD_FIR_MODE_M80x00800
u64 fir_enable_mask;/* 0x0c20 */
 
-   u8  pad_0x0c28_0x1000 [0x1000 - 0x0c28];/* 0x0c28 */
+   u8  pad_0x0c28_0x0ca8 [0x0ca8 - 0x0c28];/* 0x0c28 */
+   u64 ras_esc_0;  /* 0x0ca8 */
+   u8  pad_0x0cb0_0x1000 [0x1000 - 0x0cb0];/* 0x0cb0 */
 };
 
 extern struct cbe_pmd_regs __iomem *cbe_get_pmd_regs(struct device_node *np);
diff --git a/arch/powerpc/platforms/cell/pervasive.c 
b/arch/powerpc/platforms/cell/pervasive.c
index 812bf56..4ede22d 100644
--- a/arch/powerpc/platforms/cell/pervasive.c
+++ b/arch/powerpc/platforms/cell/pervasive.c
@@ -38,6 +38,8 @@
 #include "pervasive.h"
 #include "cbe_regs.h"
 
+static int sysreset_hack;
+
 static void cbe_power_save(void)
 {
unsigned long ctrl, thread_switch_control;
@@ -85,6 +87,9 @@ static void cbe_power_save(void)
 
 static int cbe_system_reset_exception(struct pt_regs *regs)
 {
+   int cpu;
+   struct cbe_pmd_regs __iomem *pmd;
+
switch (regs->msr & SRR1_WAKEMASK) {
case SRR1_WAKEEE:
do_IRQ(regs);
@@ -93,6 +98,18 @@ static int cbe_system_reset_exception(struct pt_regs *regs)
timer_interrupt(regs);
break;
case SRR1_WAKEMT:
+   /*
+* The BMC can inject user triggered system reset exceptions,
+* but cannot set the system reset reason in srr1,
+* so check an extra register here.
+*/
+   if (sysreset_hack && (cpu = smp_processor_id()) == 0) {
+   pmd = cbe_get_cpu_pmd_regs(cpu);
+   if (in_be64(&pmd->ras_esc_0) & 0x) {
+   out_be64(&pmd->ras_esc_0, 0);
+   return 0;
+   }
+   }
break;
 #ifdef CONFIG_CBE_RAS
case SRR1_WAKESYSERR:
@@ -113,9 +130,12 @@ static int cbe_system_reset_exception(struct pt_regs *regs)
 void __init cbe_pervasive_init(void)
 {
int cpu;
+
if (!cpu_has_feature(CPU_FTR_PAUSE_ZERO))
return;
 
+   sysreset_hack = machine_is_compatible("IBM,CBPLUS-1.0");
+
for_each_possible_cpu(cpu) {
struct cbe_pmd_regs __iomem *regs = cbe_get_cpu_pmd_regs(cpu);
if (!regs)
@@ -124,6 +144,12 @@ void __init cbe_pervasive_init(void)
 /* Enable Pause(0) control bit */
out_be64(®s->pmcr, in_be64(®s->pmcr) |
CBE_PMD_PAUSE_ZERO_CONTROL);
+
+   /* Enable JTAG system-reset hack */
+   if (sysreset_hack)
+   out_be32(®s->fir_mode_reg,
+   in_be32(®s->fir_mode_reg) |
+

[POWERPC] axonram: Do not delete gendisks queue in error path

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=b0e81ebb1062eba20fbcbe459662c0a6ec6075f7
Commit: b0e81ebb1062eba20fbcbe459662c0a6ec6075f7
Parent: fedcd2c53d838e7a69df699ce2a14e45d34d7f7f
Author: Maxim Shchetynin <[EMAIL PROTECTED]>
AuthorDate: Thu Aug 23 03:01:28 2007 +1000
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Sat Aug 25 16:58:27 2007 +1000

[POWERPC] axonram: Do not delete gendisks queue in error path

On exit do not delete gendisk's queue because this is already done by
del_gendisk(). Doing it twice may cause memory damage.

Signed-off-by: Maximilian <[EMAIL PROTECTED]>
Signed-off-by: Arnd Bergmann <[EMAIL PROTECTED]>
Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 arch/powerpc/sysdev/axonram.c |3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/sysdev/axonram.c b/arch/powerpc/sysdev/axonram.c
index eabbf82..ab037a3 100644
--- a/arch/powerpc/sysdev/axonram.c
+++ b/arch/powerpc/sysdev/axonram.c
@@ -281,8 +281,6 @@ failed:
if (bank->irq_id != NO_IRQ)
free_irq(bank->irq_id, device);
if (bank->disk != NULL) {
-   if (bank->disk->queue != NULL)
-   blk_cleanup_queue(bank->disk->queue);
if (bank->disk->major > 0)
unregister_blkdev(bank->disk->major,
bank->disk->disk_name);
@@ -310,7 +308,6 @@ axon_ram_remove(struct of_device *device)
 
device_remove_file(&device->dev, &dev_attr_ecc);
free_irq(bank->irq_id, device);
-   blk_cleanup_queue(bank->disk->queue);
unregister_blkdev(bank->disk->major, bank->disk->disk_name);
del_gendisk(bank->disk);
iounmap((void __iomem *) bank->io_addr);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[MIPS] remove unused marvell.h

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=48d365e22641f8e3881d62e56ecb9fe79513a0e7
Commit: 48d365e22641f8e3881d62e56ecb9fe79513a0e7
Parent: 106e8028ce81305b93dfd6b809c196d62910feae
Author: Yoichi Yuasa <[EMAIL PROTECTED]>
AuthorDate: Sat Aug 4 23:35:47 2007 +0900
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:54 2007 +0100

[MIPS] remove unused marvell.h

Signed-off-by: Yoichi Yuasa <[EMAIL PROTECTED]>
Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 include/asm-mips/marvell.h |   59 
 1 files changed, 0 insertions(+), 59 deletions(-)

diff --git a/include/asm-mips/marvell.h b/include/asm-mips/marvell.h
deleted file mode 100644
index b6144ba..000
--- a/include/asm-mips/marvell.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2004 by Ralf Baechle
- */
-#ifndef __ASM_MIPS_MARVELL_H
-#define __ASM_MIPS_MARVELL_H
-
-#include 
-
-#include 
-
-extern unsigned long marvell_base;
-
-/*
- * Because of an error/peculiarity in the Galileo chip, we need to swap the
- * bytes when running bigendian.
- */
-#define __MV_READ(ofs) \
-   (*(volatile u32 *)(marvell_base+(ofs)))
-#define __MV_WRITE(ofs, data)  \
-   do { *(volatile u32 *)(marvell_base+(ofs)) = (data); } while (0)
-
-#define MV_READ(ofs)   le32_to_cpu(__MV_READ(ofs))
-#define MV_WRITE(ofs, data)__MV_WRITE(ofs, cpu_to_le32(data))
-
-#define MV_READ_16(ofs)
\
-le16_to_cpu(*(volatile u16 *)(marvell_base+(ofs)))
-#define MV_WRITE_16(ofs, data)  \
-*(volatile u16 *)(marvell_base+(ofs)) = cpu_to_le16(data)
-
-#define MV_READ_8(ofs) \
-   *(volatile u8 *)(marvell_base+(ofs))
-#define MV_WRITE_8(ofs, data)  \
-   *(volatile u8 *)(marvell_base+(ofs)) = data
-
-#define MV_SET_REG_BITS(ofs, bits) \
-   (*((volatile u32 *)(marvell_base + (ofs |= ((u32)cpu_to_le32(bits))
-#define MV_RESET_REG_BITS(ofs, bits)   \
-   (*((volatile u32 *)(marvell_base + (ofs &= ~((u32)cpu_to_le32(bits))
-
-extern struct pci_ops mv_pci_ops;
-
-struct mv_pci_controller {
-   struct pci_controller   pcic;
-
-   /*
-* GT-64240/MV-64340 specific, per host bus information
-*/
-   unsigned long   config_addr;
-   unsigned long   config_vreg;
-};
-
-extern void ll_mv64340_irq(void);
-extern void mv64340_irq_init(unsigned int base);
-
-#endif /* __ASM_MIPS_MARVELL_H */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[MIPS] Fix computation of PGDIR_SHIFT for 16K pagesize on 32-bit kernels.

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4c8081e4696c7afc61930e4a49a6fa55c545b7e0
Commit: 4c8081e4696c7afc61930e4a49a6fa55c545b7e0
Parent: 50c46637aa894f904e2fb39086a3d7732f68bd50
Author: Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Tue Jul 31 21:47:03 2007 +0100
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:48 2007 +0100

[MIPS] Fix computation of PGDIR_SHIFT for 16K pagesize on 32-bit kernels.

Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 include/asm-mips/pgtable-32.h |6 +-
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/include/asm-mips/pgtable-32.h b/include/asm-mips/pgtable-32.h
index 2fbd47e..ff29485 100644
--- a/include/asm-mips/pgtable-32.h
+++ b/include/asm-mips/pgtable-32.h
@@ -43,11 +43,7 @@ extern int add_temporary_entry(unsigned long entrylo0, 
unsigned long entrylo1,
  */
 
 /* PGDIR_SHIFT determines what a third-level page table entry can map */
-#ifdef CONFIG_64BIT_PHYS_ADDR
-#define PGDIR_SHIFT21
-#else
-#define PGDIR_SHIFT22
-#endif
+#define PGDIR_SHIFT(2 * PAGE_SHIFT + PTE_ORDER - PTE_T_LOG2)
 #define PGDIR_SIZE (1UL << PGDIR_SHIFT)
 #define PGDIR_MASK (~(PGDIR_SIZE-1))
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[MIPS] Fix computation of {PGD,PMD,PTE}_T_LOG2.

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=5ff974720abec255c17af6f3732dd410d364e367
Commit: 5ff974720abec255c17af6f3732dd410d364e367
Parent: 4c8081e4696c7afc61930e4a49a6fa55c545b7e0
Author: Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Wed Aug 1 15:25:28 2007 +0100
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:48 2007 +0100

[MIPS] Fix computation of {PGD,PMD,PTE}_T_LOG2.

For the generation of asm-offset.h to work these need to be evaulatable
by gcc as a constant expression.  This issue did exist for a while but
didn't bite because they're only in asm-offset.h for debugging purposes.

Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 include/asm-mips/pgtable.h |6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/asm-mips/pgtable.h b/include/asm-mips/pgtable.h
index 2e2d70d..e2fb9db 100644
--- a/include/asm-mips/pgtable.h
+++ b/include/asm-mips/pgtable.h
@@ -168,9 +168,9 @@ static inline void pte_clear(struct mm_struct *mm, unsigned 
long addr, pte_t *pt
 #define set_pud(pudptr, pudval) do { *(pudptr) = (pudval); } while(0)
 #endif
 
-#define PGD_T_LOG2 ffz(~sizeof(pgd_t))
-#define PMD_T_LOG2 ffz(~sizeof(pmd_t))
-#define PTE_T_LOG2 ffz(~sizeof(pte_t))
+#define PGD_T_LOG2 (__builtin_ffs(sizeof(pgd_t)) - 1)
+#define PMD_T_LOG2 (__builtin_ffs(sizeof(pmd_t)) - 1)
+#define PTE_T_LOG2 (__builtin_ffs(sizeof(pte_t)) - 1)
 
 extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[MIPS] Extract {PGD,PMD,PTE}_ORDER into asm-offset.h

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=03b8b8e7c9c36e2d7c4bc9c63eeed872e6f01ad0
Commit: 03b8b8e7c9c36e2d7c4bc9c63eeed872e6f01ad0
Parent: 5ff974720abec255c17af6f3732dd410d364e367
Author: Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Wed Aug 1 15:27:36 2007 +0100
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:49 2007 +0100

[MIPS] Extract {PGD,PMD,PTE}_ORDER into asm-offset.h

For debugging purposes only.

Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/kernel/asm-offsets.c |4 
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/arch/mips/kernel/asm-offsets.c b/arch/mips/kernel/asm-offsets.c
index 0133272..ca13629 100644
--- a/arch/mips/kernel/asm-offsets.c
+++ b/arch/mips/kernel/asm-offsets.c
@@ -232,6 +232,10 @@ void output_mm_defines(void)
constant("#define _PMD_T_LOG2", PMD_T_LOG2);
constant("#define _PTE_T_LOG2", PTE_T_LOG2);
linefeed;
+   constant("#define _PGD_ORDER ", PGD_ORDER);
+   constant("#define _PMD_ORDER ", PMD_ORDER);
+   constant("#define _PTE_ORDER ", PTE_ORDER);
+   linefeed;
constant("#define _PMD_SHIFT ", PMD_SHIFT);
constant("#define _PGDIR_SHIFT   ", PGDIR_SHIFT);
linefeed;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[MIPS] Kconfig: Enable 64BIT_PHYS_ADDR only through select.

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d806cb2b601c0d6c55b29e1ef9ca2f96f499ea1c
Commit: d806cb2b601c0d6c55b29e1ef9ca2f96f499ea1c
Parent: dc0366bf3cd35e4be89f715ff834a06c590fff7a
Author: Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Thu Aug 2 00:36:08 2007 +0100
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:49 2007 +0100

[MIPS] Kconfig: Enable 64BIT_PHYS_ADDR only through select.

The user should not have to have any clue about this setting.

Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/Kconfig|3 +--
 arch/mips/au1000/Kconfig |1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 3b404b7..f08c735 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1427,8 +1427,7 @@ config SB1_PASS_2_1_WORKAROUNDS
default y
 
 config 64BIT_PHYS_ADDR
-   bool "Support for 64-bit physical address space"
-   depends on (CPU_R4X00 || CPU_R5000 || CPU_RM7000 || CPU_RM9000 || 
CPU_R1 || CPU_SB1 || CPU_MIPS32 || CPU_MIPS64) && 32BIT
+   bool
 
 config CPU_HAS_LLSC
bool
diff --git a/arch/mips/au1000/Kconfig b/arch/mips/au1000/Kconfig
index abea880..29c95d9 100644
--- a/arch/mips/au1000/Kconfig
+++ b/arch/mips/au1000/Kconfig
@@ -136,6 +136,7 @@ config SOC_AU1200
 
 config SOC_AU1X00
bool
+   select 64BIT_PHYS_ADDR
select SYS_HAS_CPU_MIPS32_R1
select SYS_SUPPORTS_32BIT_KERNEL
select SYS_SUPPORTS_APM_EMULATION
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[MIPS] Fix au1xxx_gpio_direction_* return value

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7acae224a423a492454d6550ce65c9af556d02c7
Commit: 7acae224a423a492454d6550ce65c9af556d02c7
Parent: f201b46328ac378bbd0894dd3a0c72bce4c1131e
Author: Yoichi Yuasa <[EMAIL PROTECTED]>
AuthorDate: Thu Aug 2 12:48:00 2007 +0900
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:50 2007 +0100

[MIPS] Fix au1xxx_gpio_direction_* return value

Signed-off-by: Yoichi Yuasa <[EMAIL PROTECTED]>
Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/au1000/common/gpio.c |   12 ++--
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/mips/au1000/common/gpio.c b/arch/mips/au1000/common/gpio.c
index 7abe420..8527856 100644
--- a/arch/mips/au1000/common/gpio.c
+++ b/arch/mips/au1000/common/gpio.c
@@ -131,12 +131,12 @@ int au1xxx_gpio_direction_input(unsigned gpio)
 {
if (gpio >= AU1XXX_GPIO_BASE)
 #if defined(CONFIG_SOC_AU1000)
-   ;
+   return -ENODEV;
 #else
return au1xxx_gpio2_direction_input(gpio);
 #endif
-   else
-   return au1xxx_gpio1_direction_input(gpio);
+
+   return au1xxx_gpio1_direction_input(gpio);
 }
 
 EXPORT_SYMBOL(au1xxx_gpio_direction_input);
@@ -145,12 +145,12 @@ int au1xxx_gpio_direction_output(unsigned gpio, int value)
 {
if (gpio >= AU1XXX_GPIO_BASE)
 #if defined(CONFIG_SOC_AU1000)
-   ;
+   return -ENODEV;
 #else
return au1xxx_gpio2_direction_output(gpio, value);
 #endif
-   else
-   return au1xxx_gpio1_direction_output(gpio, value);
+
+   return au1xxx_gpio1_direction_output(gpio, value);
 }
 
 EXPORT_SYMBOL(au1xxx_gpio_direction_output);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[MIPS] SEAD: Don't mark as experimental.

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d98cc84dd11c126f85675dab8e2aebcbee114a90
Commit: d98cc84dd11c126f85675dab8e2aebcbee114a90
Parent: 48d365e22641f8e3881d62e56ecb9fe79513a0e7
Author: Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Mon Aug 6 10:02:07 2007 +0100
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:54 2007 +0100

[MIPS] SEAD: Don't mark as experimental.

Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/Kconfig |3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index e7d542d..f588b55 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -192,8 +192,7 @@ config MIPS_MALTA
  board.
 
 config MIPS_SEAD
-   bool "MIPS SEAD board (EXPERIMENTAL)"
-   depends on EXPERIMENTAL
+   bool "MIPS SEAD board"
select IRQ_CPU
select DMA_NONCOHERENT
select SYS_HAS_EARLY_PRINTK
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[MIPS] SMP: Scatter __cpuinit over the code as needed.

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=428ab280a0754656fa09304017b0ce626744cc77
Commit: 428ab280a0754656fa09304017b0ce626744cc77
Parent: d98cc84dd11c126f85675dab8e2aebcbee114a90
Author: Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Mon Aug 6 14:02:12 2007 +0100
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:54 2007 +0100

[MIPS] SMP: Scatter __cpuinit over the code as needed.

MIPS doesn't do CPU hotplugging yet but since many of the functions don't
even have an __init let's fix this right.

Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/kernel/smp-mt.c|6 +++---
 arch/mips/mips-boards/malta/malta_smtc.c |6 +++---
 arch/mips/mipssim/sim_smp.c  |6 +++---
 arch/mips/pmc-sierra/yosemite/smp.c  |6 +++---
 arch/mips/qemu/q-smp.c   |6 +++---
 arch/mips/sgi-ip27/ip27-smp.c|4 ++--
 arch/mips/sibyte/cfe/smp.c   |6 +++---
 7 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/arch/mips/kernel/smp-mt.c b/arch/mips/kernel/smp-mt.c
index 19b30d6..05dcce4 100644
--- a/arch/mips/kernel/smp-mt.c
+++ b/arch/mips/kernel/smp-mt.c
@@ -287,7 +287,7 @@ void __init plat_prepare_cpus(unsigned int max_cpus)
  * (unsigned long)idle->thread_info the gp
  * assumes a 1:1 mapping of TC => VPE
  */
-void prom_boot_secondary(int cpu, struct task_struct *idle)
+void __cpuinit prom_boot_secondary(int cpu, struct task_struct *idle)
 {
struct thread_info *gp = task_thread_info(idle);
dvpe();
@@ -321,7 +321,7 @@ void prom_boot_secondary(int cpu, struct task_struct *idle)
evpe(EVPE_ENABLE);
 }
 
-void prom_init_secondary(void)
+void __cpuinit prom_init_secondary(void)
 {
/* Enable per-cpu interrupts */
 
@@ -330,7 +330,7 @@ void prom_init_secondary(void)
(STATUSF_IP0 | STATUSF_IP1 | STATUSF_IP6 | 
STATUSF_IP7));
 }
 
-void prom_smp_finish(void)
+void __cpuinit prom_smp_finish(void)
 {
write_c0_compare(read_c0_count() + (8* mips_hpt_frequency/HZ));
 
diff --git a/arch/mips/mips-boards/malta/malta_smtc.c 
b/arch/mips/mips-boards/malta/malta_smtc.c
index ea8f3bb..40d782d 100644
--- a/arch/mips/mips-boards/malta/malta_smtc.c
+++ b/arch/mips/mips-boards/malta/malta_smtc.c
@@ -24,7 +24,7 @@ void core_send_ipi(int cpu, unsigned int action)
  * Platform "CPU" startup hook
  */
 
-void prom_boot_secondary(int cpu, struct task_struct *idle)
+void __cpuinit prom_boot_secondary(int cpu, struct task_struct *idle)
 {
smtc_boot_secondary(cpu, idle);
 }
@@ -33,7 +33,7 @@ void prom_boot_secondary(int cpu, struct task_struct *idle)
  * Post-config but pre-boot cleanup entry point
  */
 
-void prom_init_secondary(void)
+void __cpuinit prom_init_secondary(void)
 {
 void smtc_init_secondary(void);
int myvpe;
@@ -75,7 +75,7 @@ void __init plat_prepare_cpus(unsigned int max_cpus)
  * SMP initialization finalization entry point
  */
 
-void prom_smp_finish(void)
+void __cpuinit prom_smp_finish(void)
 {
smtc_smp_finish();
 }
diff --git a/arch/mips/mipssim/sim_smp.c b/arch/mips/mipssim/sim_smp.c
index 38fa807..ccbbcca 100644
--- a/arch/mips/mipssim/sim_smp.c
+++ b/arch/mips/mipssim/sim_smp.c
@@ -53,7 +53,7 @@ void core_send_ipi(int cpu, unsigned int action)
  * Platform "CPU" startup hook
  */
 
-void prom_boot_secondary(int cpu, struct task_struct *idle)
+void __cpuinit prom_boot_secondary(int cpu, struct task_struct *idle)
 {
 #ifdef CONFIG_MIPS_MT_SMTC
smtc_boot_secondary(cpu, idle);
@@ -64,7 +64,7 @@ void prom_boot_secondary(int cpu, struct task_struct *idle)
  * Post-config but pre-boot cleanup entry point
  */
 
-void prom_init_secondary(void)
+void __cpuinit prom_init_secondary(void)
 {
 #ifdef CONFIG_MIPS_MT_SMTC
void smtc_init_secondary(void);
@@ -103,7 +103,7 @@ void plat_prepare_cpus(unsigned int max_cpus)
  * SMP initialization finalization entry point
  */
 
-void prom_smp_finish(void)
+void __cpuinit prom_smp_finish(void)
 {
 #ifdef CONFIG_MIPS_MT_SMTC
smtc_smp_finish();
diff --git a/arch/mips/pmc-sierra/yosemite/smp.c 
b/arch/mips/pmc-sierra/yosemite/smp.c
index 1c852d6..b0f12cd 100644
--- a/arch/mips/pmc-sierra/yosemite/smp.c
+++ b/arch/mips/pmc-sierra/yosemite/smp.c
@@ -77,7 +77,7 @@ void __init plat_prepare_cpus(unsigned int max_cpus)
  * stack so the first thing we do is throw away that stuff and load useful
  * values into the registers ...
  */
-void __init prom_boot_secondary(int cpu, struct task_struct *idle)
+void __cpuinit prom_boot_secondary(int cpu, struct task_struct *idle)
 {
unsigned long gp = (unsigned long) task_thread_info(idle);
unsigned long sp = __KSTK_TOS(idle);
@@ -97,12 +97,12 @@ void prom_cpus_done(void)
  *  After we've done initial boot, this function is called to allow the
  *  board code to clean up state, if needed
  */
-void prom_init_secondary(void)
+

[MIPS] SNI: Remove unneeded sni_machine_halt

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=dee3c75058485d55c8188a13d660d72188c5bcee
Commit: dee3c75058485d55c8188a13d660d72188c5bcee
Parent: 5d3fdeacee5d071a5c3d674231bf00cfa5d35a7a
Author: Yoichi Yuasa <[EMAIL PROTECTED]>
AuthorDate: Sat Aug 4 23:24:51 2007 +0900
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:54 2007 +0100

[MIPS] SNI: Remove unneeded sni_machine_halt

Signed-off-by: Yoichi Yuasa <[EMAIL PROTECTED]>
Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/sni/reset.c |4 
 arch/mips/sni/setup.c |2 --
 2 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/arch/mips/sni/reset.c b/arch/mips/sni/reset.c
index 2eada8a..38b6a97 100644
--- a/arch/mips/sni/reset.c
+++ b/arch/mips/sni/reset.c
@@ -40,10 +40,6 @@ void sni_machine_restart(char *command)
}
 }
 
-void sni_machine_halt(void)
-{
-}
-
 void sni_machine_power_off(void)
 {
*(volatile unsigned char *)PCIMT_CSWCSM = 0xfd;
diff --git a/arch/mips/sni/setup.c b/arch/mips/sni/setup.c
index 4fedfbd..6edbb30 100644
--- a/arch/mips/sni/setup.c
+++ b/arch/mips/sni/setup.c
@@ -26,7 +26,6 @@
 unsigned int sni_brd_type;
 
 extern void sni_machine_restart(char *command);
-extern void sni_machine_halt(void);
 extern void sni_machine_power_off(void);
 
 static void __init sni_display_setup(void)
@@ -87,7 +86,6 @@ void __init plat_mem_setup(void)
}
 
_machine_restart = sni_machine_restart;
-   _machine_halt = sni_machine_halt;
pm_power_off = sni_machine_power_off;
 
sni_display_setup();
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[MIPS] Malta: Include

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=45a98eb2b775caa3d6113cb7a5c2ff4361e09c91
Commit: 45a98eb2b775caa3d6113cb7a5c2ff4361e09c91
Parent: 428ab280a0754656fa09304017b0ce626744cc77
Author: Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Mon Aug 6 16:32:20 2007 +0100
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:54 2007 +0100

[MIPS] Malta: Include 
---
 arch/mips/mips-boards/malta/malta_smtc.c |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/mips/mips-boards/malta/malta_smtc.c 
b/arch/mips/mips-boards/malta/malta_smtc.c
index 40d782d..ae05d05 100644
--- a/arch/mips/mips-boards/malta/malta_smtc.c
+++ b/arch/mips/mips-boards/malta/malta_smtc.c
@@ -1,6 +1,7 @@
 /*
  * Malta Platform-specific hooks for SMP operation
  */
+#include 
 #include 
 
 #include 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[MIPS] SMTC: Move MIPS_CPU_IPI_IRQ definition into header.

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=fe56b954eadefb8b93b7d6b9244af38a352c8799
Commit: fe56b954eadefb8b93b7d6b9244af38a352c8799
Parent: 45a98eb2b775caa3d6113cb7a5c2ff4361e09c91
Author: Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Mon Aug 6 16:35:23 2007 +0100
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:55 2007 +0100

[MIPS] SMTC: Move MIPS_CPU_IPI_IRQ definition into header.

Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/kernel/smtc.c |2 --
 include/asm-mips/smtc.h |   10 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
index 16aa5d3..43826c1 100644
--- a/arch/mips/kernel/smtc.c
+++ b/arch/mips/kernel/smtc.c
@@ -28,8 +28,6 @@
  * This file should be built into the kernel only if CONFIG_MIPS_MT_SMTC is 
set.
  */
 
-#define MIPS_CPU_IPI_IRQ   1
-
 #define LOCK_MT_PRA() \
local_irq_save(flags); \
mtflags = dmt()
diff --git a/include/asm-mips/smtc.h b/include/asm-mips/smtc.h
index 44dfa4a..ff3e893 100644
--- a/include/asm-mips/smtc.h
+++ b/include/asm-mips/smtc.h
@@ -55,4 +55,14 @@ extern void smtc_boot_secondary(int cpu, struct task_struct 
*t);
 
 #define PARKED_INDEX   ((unsigned int)0x8000)
 
+/*
+ * Define low-level interrupt mask for IPIs, if necessary.
+ * By default, use SW interrupt 1, which requires no external
+ * hardware support, but which works only for single-core
+ * MIPS MT systems.
+ */
+#ifndef MIPS_CPU_IPI_IRQ
+#define MIPS_CPU_IPI_IRQ 1
+#endif
+
 #endif /*  _ASM_SMTC_MT_H */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[MIPS] Kconfig: Fix configuration warning by hardwiring HOTPLUG_CPU to n.

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=dbb74540aec2f70660d6ad43414a3d1f3c3aceec
Commit: dbb74540aec2f70660d6ad43414a3d1f3c3aceec
Parent: 028151bfed9f94e83a79f3886f93861587de08b4
Author: Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Tue Aug 7 14:52:17 2007 +0100
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:55 2007 +0100

[MIPS] Kconfig: Fix configuration warning by hardwiring HOTPLUG_CPU to n.

Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/Kconfig |4 
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index f588b55..2f2fd19 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -697,6 +697,10 @@ config GENERIC_ISA_DMA
bool
select ZONE_DMA
 
+config HOTPLUG_CPU
+   bool
+   default n
+
 config I8259
bool
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[MIPS] Excite: disable 64-bit kernel support.

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=3f478a873944fd4d040b7f40408da67e78473c8e
Commit: 3f478a873944fd4d040b7f40408da67e78473c8e
Parent: dbb74540aec2f70660d6ad43414a3d1f3c3aceec
Author: Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Tue Aug 7 14:55:47 2007 +0100
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:55 2007 +0100

[MIPS] Excite: disable 64-bit kernel support.

  CC  arch/mips/basler/excite/excite_prom.o
arch/mips/basler/excite/excite_prom.c:136:3: #error 64 bit support not 
implemented

Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/Kconfig |1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 2f2fd19..6595928 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -28,7 +28,6 @@ config BASLER_EXCITE
select MIPS_RM9122
select SYS_HAS_CPU_RM9000
select SYS_SUPPORTS_32BIT_KERNEL
-   select SYS_SUPPORTS_64BIT_KERNEL
select SYS_SUPPORTS_BIG_ENDIAN
select SYS_SUPPORTS_KGDB
help
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[MIPS] Fix build error if CONFIG_KALLSYMS is undefined.

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=de4b21474053513d9ad41994c95dade3e6b3362f
Commit: de4b21474053513d9ad41994c95dade3e6b3362f
Parent: 3f478a873944fd4d040b7f40408da67e78473c8e
Author: Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Tue Aug 7 15:02:55 2007 +0100
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:55 2007 +0100

[MIPS] Fix build error if CONFIG_KALLSYMS is undefined.

  CC  arch/mips/kernel/traps.o
arch/mips/kernel/traps.c: In function 'show_backtrace':
arch/mips/kernel/traps.c:110: warning: unused variable 'ra'

Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 include/asm-mips/stacktrace.h |5 -
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/include/asm-mips/stacktrace.h b/include/asm-mips/stacktrace.h
index 07f8733..87bd7ca 100644
--- a/include/asm-mips/stacktrace.h
+++ b/include/asm-mips/stacktrace.h
@@ -9,7 +9,10 @@ extern unsigned long unwind_stack(struct task_struct *task, 
unsigned long *sp,
  unsigned long pc, unsigned long *ra);
 #else
 #define raw_show_trace 1
-#define unwind_stack(task, sp, pc, ra) 0
+static inline unsigned long unwind_stack(struct task_struct *task,
+   unsigned long *sp, unsigned long pc, unsigned long *ra)
+{
+}
 #endif
 
 static __always_inline void prepare_frametrace(struct pt_regs *regs)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[MIPS] SMTC: Fix crash on bootup with idebus= command line argument.

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=b5438582090406e2ccb4169d9b2df7c9939ae42b
Commit: b5438582090406e2ccb4169d9b2df7c9939ae42b
Parent: de4b21474053513d9ad41994c95dade3e6b3362f
Author: Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Tue Aug 7 17:18:28 2007 +0100
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:55 2007 +0100

[MIPS] SMTC: Fix crash on bootup with idebus= command line argument.

Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 include/asm-mips/mach-generic/ide.h |   76 +++---
 1 files changed, 25 insertions(+), 51 deletions(-)

diff --git a/include/asm-mips/mach-generic/ide.h 
b/include/asm-mips/mach-generic/ide.h
index 6eba2e5..2b92857 100644
--- a/include/asm-mips/mach-generic/ide.h
+++ b/include/asm-mips/mach-generic/ide.h
@@ -29,68 +29,42 @@
 
 #define IDE_ARCH_OBSOLETE_DEFAULTS
 
-static __inline__ int ide_probe_legacy(void)
-{
-#ifdef CONFIG_PCI
-   struct pci_dev *dev;
-   if ((dev = pci_get_class(PCI_CLASS_BRIDGE_EISA << 8, NULL)) != NULL ||
-   (dev = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, NULL)) != NULL) {
-   pci_dev_put(dev);
-
-   return 1;
-   }
-   return 0;
-#elif defined(CONFIG_EISA) || defined(CONFIG_ISA)
-   return 1;
-#else
-   return 0;
-#endif
-}
-
 static __inline__ int ide_default_irq(unsigned long base)
 {
-   if (ide_probe_legacy())
-   switch (base) {
-   case 0x1f0:
-   return 14;
-   case 0x170:
-   return 15;
-   case 0x1e8:
-   return 11;
-   case 0x168:
-   return 10;
-   case 0x1e0:
-   return 8;
-   case 0x160:
-   return 12;
+   switch (base) {
+   case 0x1f0: return 14;
+   case 0x170: return 15;
+   case 0x1e8: return 11;
+   case 0x168: return 10;
+   case 0x1e0: return 8;
+   case 0x160: return 12;
default:
return 0;
-   }
-   else
-   return 0;
+   }
 }
 
 static __inline__ unsigned long ide_default_io_base(int index)
 {
-   if (ide_probe_legacy())
+   /*
+*  If PCI is present then it is not safe to poke around
+*  the other legacy IDE ports. Only 0x1f0 and 0x170 are
+*  defined compatibility mode ports for PCI. A user can
+*  override this using ide= but we must default safe.
+*/
+   if (no_pci_devices()) {
switch (index) {
-   case 0:
-   return 0x1f0;
-   case 1:
-   return 0x170;
-   case 2:
-   return 0x1e8;
-   case 3:
-   return 0x168;
-   case 4:
-   return 0x1e0;
-   case 5:
-   return 0x160;
-   default:
-   return 0;
+   case 2: return 0x1e8;
+   case 3: return 0x168;
+   case 4: return 0x1e0;
+   case 5: return 0x160;
}
-   else
+   }
+   switch (index) {
+   case 0: return 0x1f0;
+   case 1: return 0x170;
+   default:
return 0;
+   }
 }
 
 #define IDE_ARCH_OBSOLETE_INIT
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[MIPS] unwind_stack should return a value ...

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a204458acb358c147618c749ba0fac8ef2c5d4e6
Commit: a204458acb358c147618c749ba0fac8ef2c5d4e6
Parent: b5438582090406e2ccb4169d9b2df7c9939ae42b
Author: Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Tue Aug 7 17:30:58 2007 +0100
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:55 2007 +0100

[MIPS] unwind_stack should return a value ...

And gcc 3.4 doesn't even warn out this, grrr.

Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 include/asm-mips/stacktrace.h |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/include/asm-mips/stacktrace.h b/include/asm-mips/stacktrace.h
index 87bd7ca..0bf8281 100644
--- a/include/asm-mips/stacktrace.h
+++ b/include/asm-mips/stacktrace.h
@@ -12,6 +12,7 @@ extern unsigned long unwind_stack(struct task_struct *task, 
unsigned long *sp,
 static inline unsigned long unwind_stack(struct task_struct *task,
unsigned long *sp, unsigned long pc, unsigned long *ra)
 {
+   return 0;
 }
 #endif
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[MIPS] MIPSsim: Delete old file that survived moving around in the tree.

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=153ef95e7a9c6ae248998ba390b911bc27f4f553
Commit: 153ef95e7a9c6ae248998ba390b911bc27f4f553
Parent: a204458acb358c147618c749ba0fac8ef2c5d4e6
Author: Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Tue Aug 7 18:40:06 2007 +0100
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:56 2007 +0100

[MIPS] MIPSsim: Delete old file that survived moving around in the tree.

Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/mips-boards/sim/sim_int.c |   88 ---
 1 files changed, 0 insertions(+), 88 deletions(-)

diff --git a/arch/mips/mips-boards/sim/sim_int.c 
b/arch/mips/mips-boards/sim/sim_int.c
deleted file mode 100644
index 766e015..000
--- a/arch/mips/mips-boards/sim/sim_int.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 1999, 2005 MIPS Technologies, Inc.  All rights reserved.
- *
- *  This program is free software; you can distribute it and/or modify it
- *  under the terms of the GNU General Public License (Version 2) as
- *  published by the Free Software Foundation.
- *
- *  This program is distributed in the hope it will be useful, but WITHOUT
- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- *  for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- */
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-static inline int clz(unsigned long x)
-{
-   __asm__ (
-   "   .setpush\n"
-   "   .setmips32  \n"
-   "   clz %0, %1  \n"
-   "   .setpop \n"
-   : "=r" (x)
-   : "r" (x));
-
-   return x;
-}
-
-/*
- * Version of ffs that only looks at bits 12..15.
- */
-static inline unsigned int irq_ffs(unsigned int pending)
-{
-#if defined(CONFIG_CPU_MIPS32) || defined(CONFIG_CPU_MIPS64)
-   return -clz(pending) + 31 - CAUSEB_IP;
-#else
-   unsigned int a0 = 7;
-   unsigned int t0;
-
-   t0 = s0 & 0xf000;
-   t0 = t0 < 1;
-   t0 = t0 << 2;
-   a0 = a0 - t0;
-   s0 = s0 << t0;
-
-   t0 = s0 & 0xc000;
-   t0 = t0 < 1;
-   t0 = t0 << 1;
-   a0 = a0 - t0;
-   s0 = s0 << t0;
-
-   t0 = s0 & 0x8000;
-   t0 = t0 < 1;
-   //t0 = t0 << 2;
-   a0 = a0 - t0;
-   //s0 = s0 << t0;
-
-   return a0;
-#endif
-}
-
-asmlinkage void plat_irq_dispatch(void)
-{
-   unsigned int pending = read_c0_cause() & read_c0_status() & ST0_IM;
-   int irq;
-
-   irq = irq_ffs(pending);
-
-   if (irq > 0)
-   do_IRQ(MIPS_CPU_IRQ_BASE + irq);
-   else
-   spurious_interrupt();
-}
-
-void __init arch_init_irq(void)
-{
-   mips_cpu_irq_init();
-}
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[MIPS] MT: Use kallsyms in CPU state dump

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=bdd3ede0e11b5bc2d8424f73fb0219b8236d98bb
Commit: bdd3ede0e11b5bc2d8424f73fb0219b8236d98bb
Parent: 153ef95e7a9c6ae248998ba390b911bc27f4f553
Author: Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Fri Aug 10 18:30:57 2007 +0100
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:56 2007 +0100

[MIPS] MT: Use kallsyms in CPU state dump

Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/kernel/mips-mt.c |7 +--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/arch/mips/kernel/mips-mt.c b/arch/mips/kernel/mips-mt.c
index 7169a4d..56750b0 100644
--- a/arch/mips/kernel/mips-mt.c
+++ b/arch/mips/kernel/mips-mt.c
@@ -4,6 +4,7 @@
  */
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -84,8 +85,9 @@ void mips_mt_regdump(unsigned long mvpctl)
   read_vpe_c0_vpeconf0());
printk("   VPE%d.Status : %08lx\n",
   i, read_vpe_c0_status());
-   printk("   VPE%d.EPC : %08lx\n",
+   printk("   VPE%d.EPC : %08lx ",
   i, read_vpe_c0_epc());
+   print_symbol("%s\n", read_vpe_c0_epc());
printk("   VPE%d.Cause : %08lx\n",
   i, read_vpe_c0_cause());
printk("   VPE%d.Config7 : %08lx\n",
@@ -110,7 +112,8 @@ void mips_mt_regdump(unsigned long mvpctl)
}
printk("   TCStatus : %08lx\n", tcstatval);
printk("   TCBind : %08lx\n", read_tc_c0_tcbind());
-   printk("   TCRestart : %08lx\n", read_tc_c0_tcrestart());
+   printk("   TCRestart : %08lx ", read_tc_c0_tcrestart());
+   print_symbol("%s\n", read_tc_c0_tcrestart());
printk("   TCHalt : %08lx\n", haltval);
printk("   TCContext : %08lx\n", read_tc_c0_tccontext());
if (!haltval)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[MIPS] Gcc 3.3 build fixes.

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9975e77df5428a1afff57fd8f76a1bc0bfc247fc
Commit: 9975e77df5428a1afff57fd8f76a1bc0bfc247fc
Parent: bdd3ede0e11b5bc2d8424f73fb0219b8236d98bb
Author: Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Mon Aug 13 12:44:41 2007 +0100
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:56 2007 +0100

[MIPS] Gcc 3.3 build fixes.

Work around gcc 3.3's unability to evaluate that certain expressions indeed
are constant.

Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/mm/init.c|9 -
 include/asm-mips/pgtable.h |6 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index b8cb0dd..09d9150 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -26,6 +26,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -498,7 +499,13 @@ unsigned long pgd_current[NR_CPUS];
  * different layout ...
  */
 #define __page_aligned(order) __attribute__((__aligned__(PAGE_SIZE

[MIPS] IP22: Fix modpost warning.

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=5bd080f7d21c8f6841d63b8cdb4123a95a311eb9
Commit: 5bd080f7d21c8f6841d63b8cdb4123a95a311eb9
Parent: 9975e77df5428a1afff57fd8f76a1bc0bfc247fc
Author: Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Mon Aug 13 12:47:17 2007 +0100
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:56 2007 +0100

[MIPS] IP22: Fix modpost warning.

  MODPOST vmlinux.o
WARNING: vmlinux.o(.text+0xc70): Section mismatch: reference to 
.init.text:add_memory_region (between 'probe_memory' and 'enable_local0_irq')

Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/sgi-ip22/ip22-mc.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/mips/sgi-ip22/ip22-mc.c b/arch/mips/sgi-ip22/ip22-mc.c
index ddb6506..01a805d 100644
--- a/arch/mips/sgi-ip22/ip22-mc.c
+++ b/arch/mips/sgi-ip22/ip22-mc.c
@@ -47,7 +47,7 @@ struct mem {
 /*
  * Detect installed memory, do some sanity checks and notify kernel about it
  */
-static void probe_memory(void)
+static void __init probe_memory(void)
 {
int i, j, found, cnt = 0;
struct mem bank[4];
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[MIPS] Update capcella_defconfig

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d2a34c400b59f93c8c3875d46e067bb4e361b93f
Commit: d2a34c400b59f93c8c3875d46e067bb4e361b93f
Parent: 5bd080f7d21c8f6841d63b8cdb4123a95a311eb9
Author: Yoichi Yuasa <[EMAIL PROTECTED]>
AuthorDate: Tue Aug 14 20:27:47 2007 +0900
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:56 2007 +0100

[MIPS] Update capcella_defconfig

Signed-off-by: Yoichi Yuasa <[EMAIL PROTECTED]>
Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/configs/capcella_defconfig |  417 ++
 1 files changed, 121 insertions(+), 296 deletions(-)

diff --git a/arch/mips/configs/capcella_defconfig 
b/arch/mips/configs/capcella_defconfig
index 4dc3197..8ecbbb2 100644
--- a/arch/mips/configs/capcella_defconfig
+++ b/arch/mips/configs/capcella_defconfig
@@ -1,60 +1,47 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20
-# Tue Feb 20 21:47:22 2007
+# Linux kernel version: 2.6.23-rc2
+# Wed Aug  8 10:23:16 2007
 #
 CONFIG_MIPS=y
 
 #
 # Machine selection
 #
-CONFIG_ZONE_DMA=y
-# CONFIG_MIPS_MTX1 is not set
-# CONFIG_MIPS_BOSPORUS is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_MIRAGE is not set
+# CONFIG_MACH_ALCHEMY is not set
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
+# CONFIG_LEMOTE_FULONG is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
-# CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
-# CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MIPS_XXS1500 is not set
+# CONFIG_MARKEINS is not set
+CONFIG_MACH_VR41XX=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-CONFIG_MACH_VR41XX=y
+# CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
-# CONFIG_MARKEINS is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_CARMEL is not set
 # CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_BIGSUR is not set
 # CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
+# CONFIG_WR_PPMC is not set
 # CONFIG_CASIO_E55 is not set
 # CONFIG_IBM_WORKPAD is not set
 # CONFIG_NEC_CMBVR4133 is not set
@@ -73,6 +60,8 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
+# CONFIG_HOTPLUG_CPU is not set
+# CONFIG_NO_IOPORT is not set
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
@@ -82,6 +71,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
 #
 # CPU selection
 #
+# CONFIG_CPU_LOONGSON2 is not set
 # CONFIG_CPU_MIPS32_R1 is not set
 # CONFIG_CPU_MIPS32_R2 is not set
 # CONFIG_CPU_MIPS64_R1 is not set
@@ -103,7 +93,6 @@ CONFIG_CPU_VR41XX=y
 # CONFIG_CPU_SB1 is not set
 CONFIG_SYS_HAS_CPU_VR41XX=y
 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
 
@@ -119,7 +108,6 @@ CONFIG_PAGE_SIZE_4KB=y
 CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_VPE_LOADER is not set
 CONFIG_CPU_HAS_SYNC=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
@@ -133,48 +121,47 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_VIRT_TO_BUS=y
 # CONFIG_HZ_48 is not set
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
+CONFIG_HZ_250=y
 # CONFIG_HZ_256 is not set
-CONFIG_HZ_1000=y
+# CONFIG_HZ_1000 is not set
 # CONFIG_HZ_1024 is not set
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_HZ=1000
+CONFIG_HZ=250
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_KEXEC is not set
+CONFIG_SECCOMP=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity 

[MIPS] Update e55_defconfig

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=be72bd605039d2840391fec513edd58983345a74
Commit: be72bd605039d2840391fec513edd58983345a74
Parent: d2a34c400b59f93c8c3875d46e067bb4e361b93f
Author: Yoichi Yuasa <[EMAIL PROTECTED]>
AuthorDate: Tue Aug 14 20:29:02 2007 +0900
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:56 2007 +0100

[MIPS] Update e55_defconfig

Signed-off-by: Yoichi Yuasa <[EMAIL PROTECTED]>
Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/configs/e55_defconfig |  319 ---
 1 files changed, 97 insertions(+), 222 deletions(-)

diff --git a/arch/mips/configs/e55_defconfig b/arch/mips/configs/e55_defconfig
index 5467d75..d0d07fa 100644
--- a/arch/mips/configs/e55_defconfig
+++ b/arch/mips/configs/e55_defconfig
@@ -1,60 +1,47 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20
-# Tue Feb 20 21:47:28 2007
+# Linux kernel version: 2.6.23-rc2
+# Wed Aug  8 10:36:25 2007
 #
 CONFIG_MIPS=y
 
 #
 # Machine selection
 #
-CONFIG_ZONE_DMA=y
-# CONFIG_MIPS_MTX1 is not set
-# CONFIG_MIPS_BOSPORUS is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_MIRAGE is not set
+# CONFIG_MACH_ALCHEMY is not set
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
+# CONFIG_LEMOTE_FULONG is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
-# CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
-# CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MIPS_XXS1500 is not set
+# CONFIG_MARKEINS is not set
+CONFIG_MACH_VR41XX=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-CONFIG_MACH_VR41XX=y
+# CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
-# CONFIG_MARKEINS is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_CARMEL is not set
 # CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_BIGSUR is not set
 # CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
+# CONFIG_WR_PPMC is not set
 CONFIG_CASIO_E55=y
 # CONFIG_IBM_WORKPAD is not set
 # CONFIG_NEC_CMBVR4133 is not set
@@ -72,6 +59,8 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
+# CONFIG_HOTPLUG_CPU is not set
+# CONFIG_NO_IOPORT is not set
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
@@ -81,6 +70,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
 #
 # CPU selection
 #
+# CONFIG_CPU_LOONGSON2 is not set
 # CONFIG_CPU_MIPS32_R1 is not set
 # CONFIG_CPU_MIPS32_R2 is not set
 # CONFIG_CPU_MIPS64_R1 is not set
@@ -102,7 +92,6 @@ CONFIG_CPU_VR41XX=y
 # CONFIG_CPU_SB1 is not set
 CONFIG_SYS_HAS_CPU_VR41XX=y
 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
 
@@ -118,7 +107,6 @@ CONFIG_PAGE_SIZE_4KB=y
 CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_VPE_LOADER is not set
 CONFIG_CPU_HAS_SYNC=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
@@ -132,45 +120,44 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_VIRT_TO_BUS=y
 # CONFIG_HZ_48 is not set
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
+CONFIG_HZ_250=y
 # CONFIG_HZ_256 is not set
-CONFIG_HZ_1000=y
+# CONFIG_HZ_1000 is not set
 # CONFIG_HZ_1024 is not set
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_HZ=1000
+CONFIG_HZ=250
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_KEXEC is not set
+CONFIG_SECCOMP=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CON

[MIPS] Update mpc30x_defconfig

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f5594fd91497ab7eec8dd1859a90ebb31058fd5d
Commit: f5594fd91497ab7eec8dd1859a90ebb31058fd5d
Parent: be72bd605039d2840391fec513edd58983345a74
Author: Yoichi Yuasa <[EMAIL PROTECTED]>
AuthorDate: Tue Aug 14 20:30:21 2007 +0900
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:56 2007 +0100

[MIPS] Update mpc30x_defconfig

Signed-off-by: Yoichi Yuasa <[EMAIL PROTECTED]>
Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/configs/mpc30x_defconfig |  572 +---
 1 files changed, 136 insertions(+), 436 deletions(-)

diff --git a/arch/mips/configs/mpc30x_defconfig 
b/arch/mips/configs/mpc30x_defconfig
index 239810b..8334350 100644
--- a/arch/mips/configs/mpc30x_defconfig
+++ b/arch/mips/configs/mpc30x_defconfig
@@ -1,60 +1,47 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20
-# Tue Feb 20 21:47:35 2007
+# Linux kernel version: 2.6.23-rc2
+# Wed Aug  8 15:09:51 2007
 #
 CONFIG_MIPS=y
 
 #
 # Machine selection
 #
-CONFIG_ZONE_DMA=y
-# CONFIG_MIPS_MTX1 is not set
-# CONFIG_MIPS_BOSPORUS is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_MIRAGE is not set
+# CONFIG_MACH_ALCHEMY is not set
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
+# CONFIG_LEMOTE_FULONG is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
-# CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
-# CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MIPS_XXS1500 is not set
+# CONFIG_MARKEINS is not set
+CONFIG_MACH_VR41XX=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-CONFIG_MACH_VR41XX=y
+# CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
-# CONFIG_MARKEINS is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_CARMEL is not set
 # CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_BIGSUR is not set
 # CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
+# CONFIG_WR_PPMC is not set
 # CONFIG_CASIO_E55 is not set
 # CONFIG_IBM_WORKPAD is not set
 # CONFIG_NEC_CMBVR4133 is not set
@@ -73,6 +60,8 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
+# CONFIG_HOTPLUG_CPU is not set
+# CONFIG_NO_IOPORT is not set
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
@@ -82,6 +71,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
 #
 # CPU selection
 #
+# CONFIG_CPU_LOONGSON2 is not set
 # CONFIG_CPU_MIPS32_R1 is not set
 # CONFIG_CPU_MIPS32_R2 is not set
 # CONFIG_CPU_MIPS64_R1 is not set
@@ -103,7 +93,6 @@ CONFIG_CPU_VR41XX=y
 # CONFIG_CPU_SB1 is not set
 CONFIG_SYS_HAS_CPU_VR41XX=y
 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
 
@@ -119,7 +108,6 @@ CONFIG_PAGE_SIZE_4KB=y
 CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_VPE_LOADER is not set
 CONFIG_CPU_HAS_SYNC=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
@@ -133,48 +121,47 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_VIRT_TO_BUS=y
 # CONFIG_HZ_48 is not set
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
+CONFIG_HZ_250=y
 # CONFIG_HZ_256 is not set
-CONFIG_HZ_1000=y
+# CONFIG_HZ_1000 is not set
 # CONFIG_HZ_1024 is not set
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_HZ=1000
+CONFIG_HZ=250
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_KEXEC is not set
+CONFIG_SECCOMP=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level opti

[MIPS] Update tb0226_defconfig

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=96a6d8727f2b4a5b94f2a78d67c6126c87144e2b
Commit: 96a6d8727f2b4a5b94f2a78d67c6126c87144e2b
Parent: aabfc589919e9833df25754138e25adafbe3919d
Author: Yoichi Yuasa <[EMAIL PROTECTED]>
AuthorDate: Tue Aug 14 20:32:47 2007 +0900
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:57 2007 +0100

[MIPS] Update tb0226_defconfig

Signed-off-by: Yoichi Yuasa <[EMAIL PROTECTED]>
Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/configs/tb0226_defconfig |  548 +---
 1 files changed, 132 insertions(+), 416 deletions(-)

diff --git a/arch/mips/configs/tb0226_defconfig 
b/arch/mips/configs/tb0226_defconfig
index aea6756..9fd0fae 100644
--- a/arch/mips/configs/tb0226_defconfig
+++ b/arch/mips/configs/tb0226_defconfig
@@ -1,68 +1,56 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20
-# Tue Feb 20 21:47:41 2007
+# Linux kernel version: 2.6.23-rc2
+# Thu Aug  9 11:16:55 2007
 #
 CONFIG_MIPS=y
 
 #
 # Machine selection
 #
-CONFIG_ZONE_DMA=y
-# CONFIG_MIPS_MTX1 is not set
-# CONFIG_MIPS_BOSPORUS is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_MIRAGE is not set
+# CONFIG_MACH_ALCHEMY is not set
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
+# CONFIG_LEMOTE_FULONG is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
-# CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
-# CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MIPS_XXS1500 is not set
+# CONFIG_MARKEINS is not set
+CONFIG_MACH_VR41XX=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-CONFIG_MACH_VR41XX=y
+# CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
-# CONFIG_MARKEINS is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_CARMEL is not set
 # CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_BIGSUR is not set
 # CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
+# CONFIG_WR_PPMC is not set
 # CONFIG_CASIO_E55 is not set
 # CONFIG_IBM_WORKPAD is not set
 # CONFIG_NEC_CMBVR4133 is not set
 CONFIG_TANBAC_TB022X=y
-CONFIG_TANBAC_TB0226=y
-# CONFIG_TANBAC_TB0287 is not set
 # CONFIG_VICTOR_MPC30X is not set
 # CONFIG_ZAO_CAPCELLA is not set
+# CONFIG_TANBAC_TB0219 is not set
+CONFIG_TANBAC_TB0226=y
+# CONFIG_TANBAC_TB0287 is not set
 CONFIG_PCI_VR41XX=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
@@ -75,6 +63,8 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
+# CONFIG_HOTPLUG_CPU is not set
+# CONFIG_NO_IOPORT is not set
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
@@ -84,6 +74,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
 #
 # CPU selection
 #
+# CONFIG_CPU_LOONGSON2 is not set
 # CONFIG_CPU_MIPS32_R1 is not set
 # CONFIG_CPU_MIPS32_R2 is not set
 # CONFIG_CPU_MIPS64_R1 is not set
@@ -105,7 +96,6 @@ CONFIG_CPU_VR41XX=y
 # CONFIG_CPU_SB1 is not set
 CONFIG_SYS_HAS_CPU_VR41XX=y
 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
 
@@ -121,7 +111,6 @@ CONFIG_PAGE_SIZE_4KB=y
 CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_VPE_LOADER is not set
 CONFIG_CPU_HAS_SYNC=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
@@ -135,48 +124,47 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_VIRT_TO_BUS=y
 # CONFIG_HZ_48 is not set
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
+CONFIG_HZ_250=y
 # CONFIG_HZ_256 is not set
-CONFIG_HZ_1000=y
+# CONFIG_HZ_1000 is not set
 # CONFIG_HZ_1024 is not set
 CONFIG

[MIPS] Update tb0219_defconfig

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=aabfc589919e9833df25754138e25adafbe3919d
Commit: aabfc589919e9833df25754138e25adafbe3919d
Parent: f5594fd91497ab7eec8dd1859a90ebb31058fd5d
Author: Yoichi Yuasa <[EMAIL PROTECTED]>
AuthorDate: Tue Aug 14 20:31:35 2007 +0900
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:57 2007 +0100

[MIPS] Update tb0219_defconfig

Signed-off-by: Yoichi Yuasa <[EMAIL PROTECTED]>
Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/configs/tb0219_defconfig |  504 +++-
 1 files changed, 154 insertions(+), 350 deletions(-)

diff --git a/arch/mips/configs/tb0219_defconfig 
b/arch/mips/configs/tb0219_defconfig
index e9f2cef..326aa7a 100644
--- a/arch/mips/configs/tb0219_defconfig
+++ b/arch/mips/configs/tb0219_defconfig
@@ -1,60 +1,47 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-rc6
-# Sun Apr 15 01:06:01 2007
+# Linux kernel version: 2.6.23-rc2
+# Wed Aug  8 16:11:47 2007
 #
 CONFIG_MIPS=y
 
 #
 # Machine selection
 #
-CONFIG_ZONE_DMA=y
-# CONFIG_MIPS_MTX1 is not set
-# CONFIG_MIPS_BOSPORUS is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_MIRAGE is not set
+# CONFIG_MACH_ALCHEMY is not set
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
+# CONFIG_LEMOTE_FULONG is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
-# CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
-# CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MIPS_XXS1500 is not set
+# CONFIG_MARKEINS is not set
+CONFIG_MACH_VR41XX=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-CONFIG_MACH_VR41XX=y
+# CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
-# CONFIG_MARKEINS is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_CARMEL is not set
 # CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_BIGSUR is not set
 # CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
+# CONFIG_WR_PPMC is not set
 # CONFIG_CASIO_E55 is not set
 # CONFIG_IBM_WORKPAD is not set
 # CONFIG_NEC_CMBVR4133 is not set
@@ -76,6 +63,8 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
+# CONFIG_HOTPLUG_CPU is not set
+# CONFIG_NO_IOPORT is not set
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
@@ -85,6 +74,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
 #
 # CPU selection
 #
+# CONFIG_CPU_LOONGSON2 is not set
 # CONFIG_CPU_MIPS32_R1 is not set
 # CONFIG_CPU_MIPS32_R2 is not set
 # CONFIG_CPU_MIPS64_R1 is not set
@@ -106,7 +96,6 @@ CONFIG_CPU_VR41XX=y
 # CONFIG_CPU_SB1 is not set
 CONFIG_SYS_HAS_CPU_VR41XX=y
 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
 
@@ -122,7 +111,6 @@ CONFIG_PAGE_SIZE_4KB=y
 CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_VPE_LOADER is not set
 CONFIG_CPU_HAS_SYNC=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
@@ -136,46 +124,44 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_VIRT_TO_BUS=y
 # CONFIG_HZ_48 is not set
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
+CONFIG_HZ_250=y
 # CONFIG_HZ_256 is not set
-CONFIG_HZ_1000=y
+# CONFIG_HZ_1000 is not set
 # CONFIG_HZ_1024 is not set
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_HZ=1000
+CONFIG_HZ=250
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_KEXEC is not set
+CONFIG_SECCOMP=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level 

[MIPS] Update tb0287_defconfig

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=dd7043815a710e93a731fbb56782db33467755e9
Commit: dd7043815a710e93a731fbb56782db33467755e9
Parent: 96a6d8727f2b4a5b94f2a78d67c6126c87144e2b
Author: Yoichi Yuasa <[EMAIL PROTECTED]>
AuthorDate: Tue Aug 14 20:33:54 2007 +0900
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:57 2007 +0100

[MIPS] Update tb0287_defconfig

Signed-off-by: Yoichi Yuasa <[EMAIL PROTECTED]>
Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/configs/tb0287_defconfig |  592 
 1 files changed, 193 insertions(+), 399 deletions(-)

diff --git a/arch/mips/configs/tb0287_defconfig 
b/arch/mips/configs/tb0287_defconfig
index 66383ec..499b6bd 100644
--- a/arch/mips/configs/tb0287_defconfig
+++ b/arch/mips/configs/tb0287_defconfig
@@ -1,68 +1,56 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-rc1
-# Thu Feb 22 10:38:09 2007
+# Linux kernel version: 2.6.23-rc2
+# Thu Aug  9 14:03:54 2007
 #
 CONFIG_MIPS=y
 
 #
 # Machine selection
 #
-CONFIG_ZONE_DMA=y
-# CONFIG_MIPS_MTX1 is not set
-# CONFIG_MIPS_BOSPORUS is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_MIRAGE is not set
+# CONFIG_MACH_ALCHEMY is not set
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
+# CONFIG_LEMOTE_FULONG is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
-# CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
-# CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MIPS_XXS1500 is not set
+# CONFIG_MARKEINS is not set
+CONFIG_MACH_VR41XX=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-CONFIG_MACH_VR41XX=y
+# CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
-# CONFIG_MARKEINS is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_CARMEL is not set
 # CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_BIGSUR is not set
 # CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
+# CONFIG_WR_PPMC is not set
 # CONFIG_CASIO_E55 is not set
 # CONFIG_IBM_WORKPAD is not set
 # CONFIG_NEC_CMBVR4133 is not set
 CONFIG_TANBAC_TB022X=y
-# CONFIG_TANBAC_TB0226 is not set
-CONFIG_TANBAC_TB0287=y
 # CONFIG_VICTOR_MPC30X is not set
 # CONFIG_ZAO_CAPCELLA is not set
+# CONFIG_TANBAC_TB0219 is not set
+# CONFIG_TANBAC_TB0226 is not set
+CONFIG_TANBAC_TB0287=y
 CONFIG_PCI_VR41XX=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
@@ -75,6 +63,8 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
+# CONFIG_HOTPLUG_CPU is not set
+# CONFIG_NO_IOPORT is not set
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
@@ -84,6 +74,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
 #
 # CPU selection
 #
+# CONFIG_CPU_LOONGSON2 is not set
 # CONFIG_CPU_MIPS32_R1 is not set
 # CONFIG_CPU_MIPS32_R2 is not set
 # CONFIG_CPU_MIPS64_R1 is not set
@@ -105,7 +96,6 @@ CONFIG_CPU_VR41XX=y
 # CONFIG_CPU_SB1 is not set
 CONFIG_SYS_HAS_CPU_VR41XX=y
 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
 
@@ -121,7 +111,6 @@ CONFIG_PAGE_SIZE_4KB=y
 CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_VPE_LOADER is not set
 CONFIG_CPU_HAS_SYNC=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
@@ -135,86 +124,83 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_VIRT_TO_BUS=y
 # CONFIG_HZ_48 is not set
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
+CONFIG_HZ_250=y
 # CONFIG_HZ_256 is not set
-CONFIG_HZ_1000=y
+# CONFIG_HZ_1000 is not set
 # CONFIG_HZ_1024 is not set
 CO

[MIPS] Update workpad_defconfig

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=0d2d6446fe69ee85636648b4b8abb32c456a416f
Commit: 0d2d6446fe69ee85636648b4b8abb32c456a416f
Parent: dd7043815a710e93a731fbb56782db33467755e9
Author: Yoichi Yuasa <[EMAIL PROTECTED]>
AuthorDate: Tue Aug 14 20:34:52 2007 +0900
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:58 2007 +0100

[MIPS] Update workpad_defconfig

Signed-off-by: Yoichi Yuasa <[EMAIL PROTECTED]>
Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/configs/workpad_defconfig |  507 ++-
 1 files changed, 140 insertions(+), 367 deletions(-)

diff --git a/arch/mips/configs/workpad_defconfig 
b/arch/mips/configs/workpad_defconfig
index db6fd4f..b52256c 100644
--- a/arch/mips/configs/workpad_defconfig
+++ b/arch/mips/configs/workpad_defconfig
@@ -1,60 +1,47 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20
-# Tue Feb 20 21:47:42 2007
+# Linux kernel version: 2.6.23-rc2
+# Thu Aug  9 14:33:57 2007
 #
 CONFIG_MIPS=y
 
 #
 # Machine selection
 #
-CONFIG_ZONE_DMA=y
-# CONFIG_MIPS_MTX1 is not set
-# CONFIG_MIPS_BOSPORUS is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_MIRAGE is not set
+# CONFIG_MACH_ALCHEMY is not set
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
+# CONFIG_LEMOTE_FULONG is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
-# CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
-# CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MIPS_XXS1500 is not set
+# CONFIG_MARKEINS is not set
+CONFIG_MACH_VR41XX=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-CONFIG_MACH_VR41XX=y
+# CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
-# CONFIG_MARKEINS is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_CARMEL is not set
 # CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_BIGSUR is not set
 # CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
+# CONFIG_WR_PPMC is not set
 # CONFIG_CASIO_E55 is not set
 CONFIG_IBM_WORKPAD=y
 # CONFIG_NEC_CMBVR4133 is not set
@@ -72,6 +59,8 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
+# CONFIG_HOTPLUG_CPU is not set
+# CONFIG_NO_IOPORT is not set
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
@@ -81,6 +70,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
 #
 # CPU selection
 #
+# CONFIG_CPU_LOONGSON2 is not set
 # CONFIG_CPU_MIPS32_R1 is not set
 # CONFIG_CPU_MIPS32_R2 is not set
 # CONFIG_CPU_MIPS64_R1 is not set
@@ -102,7 +92,6 @@ CONFIG_CPU_VR41XX=y
 # CONFIG_CPU_SB1 is not set
 CONFIG_SYS_HAS_CPU_VR41XX=y
 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
 
@@ -118,7 +107,6 @@ CONFIG_PAGE_SIZE_4KB=y
 CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_VPE_LOADER is not set
 CONFIG_CPU_HAS_SYNC=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
@@ -132,48 +120,47 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_VIRT_TO_BUS=y
 # CONFIG_HZ_48 is not set
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
+CONFIG_HZ_250=y
 # CONFIG_HZ_256 is not set
-CONFIG_HZ_1000=y
+# CONFIG_HZ_1000 is not set
 # CONFIG_HZ_1024 is not set
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_HZ=1000
+CONFIG_HZ=250
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_KEXEC is not set
+CONFIG_SECCOMP=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+#

[MIPS] Update Cobalt defconfig

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c5d7eb9e8c25cc908461c34844241e5bad0504fe
Commit: c5d7eb9e8c25cc908461c34844241e5bad0504fe
Parent: 0d2d6446fe69ee85636648b4b8abb32c456a416f
Author: Yoichi Yuasa <[EMAIL PROTECTED]>
AuthorDate: Tue Aug 7 23:20:21 2007 +0900
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:58 2007 +0100

[MIPS] Update Cobalt defconfig

Signed-off-by: Yoichi Yuasa <[EMAIL PROTECTED]>
Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/configs/cobalt_defconfig |  341 
 1 files changed, 154 insertions(+), 187 deletions(-)

diff --git a/arch/mips/configs/cobalt_defconfig 
b/arch/mips/configs/cobalt_defconfig
index 6d6a01b..ebcb7ad 100644
--- a/arch/mips/configs/cobalt_defconfig
+++ b/arch/mips/configs/cobalt_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-rc2
-# Fri May 25 11:17:29 2007
+# Linux kernel version: 2.6.23-rc2
+# Tue Aug  7 22:12:54 2007
 #
 CONFIG_MIPS=y
 
@@ -13,33 +13,35 @@ CONFIG_MIPS=y
 CONFIG_MIPS_COBALT=y
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
+# CONFIG_LEMOTE_FULONG is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_SEAD is not set
-# CONFIG_WR_PPMC is not set
 # CONFIG_MIPS_SIM is not set
+# CONFIG_MARKEINS is not set
+# CONFIG_MACH_VR41XX is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
-# CONFIG_MACH_VR41XX is not set
+# CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_QEMU is not set
-# CONFIG_MARKEINS is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_CARMEL is not set
 # CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_BIGSUR is not set
 # CONFIG_SNI_RM is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
+# CONFIG_WR_PPMC is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
@@ -54,6 +56,7 @@ CONFIG_DMA_NEED_PCI_MAP_STATE=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_SYS_HAS_EARLY_PRINTK=y
 CONFIG_I8259=y
+# CONFIG_NO_IOPORT is not set
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
@@ -64,6 +67,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
 #
 # CPU selection
 #
+# CONFIG_CPU_LOONGSON2 is not set
 # CONFIG_CPU_MIPS32_R1 is not set
 # CONFIG_CPU_MIPS32_R2 is not set
 # CONFIG_CPU_MIPS64_R1 is not set
@@ -101,7 +105,6 @@ CONFIG_PAGE_SIZE_4KB=y
 CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_VPE_LOADER is not set
 CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_HAS_SYNC=y
 CONFIG_GENERIC_HARDIRQS=y
@@ -117,43 +120,40 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=0
+CONFIG_VIRT_TO_BUS=y
 # CONFIG_HZ_48 is not set
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
+CONFIG_HZ_250=y
 # CONFIG_HZ_256 is not set
-CONFIG_HZ_1000=y
+# CONFIG_HZ_1000 is not set
 # CONFIG_HZ_1024 is not set
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_HZ=1000
+CONFIG_HZ=250
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_KEXEC is not set
+CONFIG_SECCOMP=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
@@ -185,19 +185,17 @@ CONFIG_SLAB=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
-# CONFIG_MODULES is not set
-
-#
-# Block layer
-#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_KMOD is not set
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONF

[MIPS] Fix invalid semicolon after if statement

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=0806133af401381c559673c3e7269bf62af40388
Commit: 0806133af401381c559673c3e7269bf62af40388
Parent: c5d7eb9e8c25cc908461c34844241e5bad0504fe
Author: Ilpo Järvinen <[EMAIL PROTECTED]>
AuthorDate: Thu Aug 16 01:03:01 2007 +0300
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:58 2007 +0100

[MIPS] Fix invalid semicolon after if statement

Signed-off-by: Ilpo Järvinen <[EMAIL PROTECTED]>
Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/kernel/irixsig.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/mips/kernel/irixsig.c b/arch/mips/kernel/irixsig.c
index 6980deb..28b2a8f 100644
--- a/arch/mips/kernel/irixsig.c
+++ b/arch/mips/kernel/irixsig.c
@@ -725,7 +725,7 @@ asmlinkage int irix_getcontext(struct pt_regs *regs)
   current->comm, current->pid, ctx);
 #endif
 
-   if (!access_ok(VERIFY_WRITE, ctx, sizeof(*ctx)));
+   if (!access_ok(VERIFY_WRITE, ctx, sizeof(*ctx)))
return -EFAULT;
 
error = __put_user(current->thread.irix_oldctx, &ctx->link);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[MIPS] Fix gcc 3.3 warning.

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c99dcac435cec7aca313638db2f1bc406f29210b
Commit: c99dcac435cec7aca313638db2f1bc406f29210b
Parent: 0806133af401381c559673c3e7269bf62af40388
Author: Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Thu Aug 16 12:10:16 2007 +0100
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:58 2007 +0100

[MIPS] Fix gcc 3.3 warning.

  CC  arch/mips/kernel/cpu-bugs64.o
arch/mips/kernel/cpu-bugs64.c: In function 'align_mod':
arch/mips/kernel/cpu-bugs64.c:23: warning: asm operand 0 probably doesn't 
match constraints
arch/mips/kernel/cpu-bugs64.c:23: warning: asm operand 1 probably doesn't 
match constraints

Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/kernel/cpu-bugs64.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/mips/kernel/cpu-bugs64.c b/arch/mips/kernel/cpu-bugs64.c
index c09337b..ac04f0a 100644
--- a/arch/mips/kernel/cpu-bugs64.c
+++ b/arch/mips/kernel/cpu-bugs64.c
@@ -29,7 +29,7 @@ static inline void align_mod(const int align, const int mod)
".endr\n\t"
".set   pop"
:
-   : "n" (align), "n" (mod));
+   : "rn" (align), "rn" (mod));
 }
 
 static inline void mult_sh_align_mod(long *v1, long *v2, long *w,
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] rtc: Make rtc-rs5c348 driver hotplug-aware

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9f90a03a7f93be7f247aa902a7d962a56a6f600e
Commit: 9f90a03a7f93be7f247aa902a7d962a56a6f600e
Parent: c99dcac435cec7aca313638db2f1bc406f29210b
Author: Atsushi Nemoto <[EMAIL PROTECTED]>
AuthorDate: Sun Aug 19 22:32:10 2007 +0900
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:58 2007 +0100

[PATCH] rtc: Make rtc-rs5c348 driver hotplug-aware

The rtc-rs5c348 SPI driver name doesn't match its module name, which
prevents it from properly hotplugging.  There is only one in-tree user
of its driver, which is fixed by this patch too.

Signed-off-by: Atsushi Nemoto <[EMAIL PROTECTED]>
Acked-by: David Brownell <[EMAIL PROTECTED]>
Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/tx4938/toshiba_rbtx4938/setup.c |2 +-
 drivers/rtc/rtc-rs5c348.c |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/mips/tx4938/toshiba_rbtx4938/setup.c 
b/arch/mips/tx4938/toshiba_rbtx4938/setup.c
index 57f3c70..84ebff7 100644
--- a/arch/mips/tx4938/toshiba_rbtx4938/setup.c
+++ b/arch/mips/tx4938/toshiba_rbtx4938/setup.c
@@ -1115,7 +1115,7 @@ static void __init txx9_spi_init(unsigned long base, int 
irq)
 static int __init rbtx4938_spi_init(void)
 {
struct spi_board_info srtc_info = {
-   .modalias = "rs5c348",
+   .modalias = "rtc-rs5c348",
.max_speed_hz = 100, /* 1.0Mbps @ Vdd 2.0V */
.bus_num = 0,
.chip_select = 16 + SRTC_CS,
diff --git a/drivers/rtc/rtc-rs5c348.c b/drivers/rtc/rtc-rs5c348.c
index f50f3fc..8394626 100644
--- a/drivers/rtc/rtc-rs5c348.c
+++ b/drivers/rtc/rtc-rs5c348.c
@@ -226,7 +226,7 @@ static int __devexit rs5c348_remove(struct spi_device *spi)
 
 static struct spi_driver rs5c348_driver = {
.driver = {
-   .name   = "rs5c348",
+   .name   = "rtc-rs5c348",
.bus= &spi_bus_type,
.owner  = THIS_MODULE,
},
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[MIPS] Polish .

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=1bfa771e610bebb29d8051884ff3672845ac9c00
Commit: 1bfa771e610bebb29d8051884ff3672845ac9c00
Parent: 88eb4134b0515babd2e6b3f817ed685886e07479
Author: Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Wed Aug 22 22:42:18 2007 +0100
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:59 2007 +0100

[MIPS] Polish .

Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 include/asm-mips/edac.h |   17 -
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/include/asm-mips/edac.h b/include/asm-mips/edac.h
index 83719ee..4da0c1f 100644
--- a/include/asm-mips/edac.h
+++ b/include/asm-mips/edac.h
@@ -9,8 +9,7 @@ static inline void atomic_scrub(void *va, u32 size)
unsigned long temp;
u32 i;
 
-   for (i = 0; i < size / sizeof(unsigned long); i++, virt_addr++) {
-
+   for (i = 0; i < size / sizeof(unsigned long); i++) {
/*
 * Very carefully read and write to memory atomically
 * so we are interrupt, DMA and SMP safe.
@@ -19,16 +18,16 @@ static inline void atomic_scrub(void *va, u32 size)
 */
 
__asm__ __volatile__ (
-   "   .setmips3   \n"
-   "1: ll  %0, %1  # atomic_add\n"
-   "   ll  %0, %1  # atomic_add\n"
-   "   addu%0, $0  \n"
-   "   sc  %0, %1  \n"
-   "   beqz%0, 1b  \n"
-   "   .setmips0   \n"
+   "   .setmips2   \n"
+   "1: ll  %0, %1  # atomic_scrub  \n"
+   "   addu%0, $0  \n"
+   "   sc  %0, %1  \n"
+   "   beqz%0, 1b  \n"
+   "   .setmips0   \n"
: "=&r" (temp), "=m" (*virt_addr)
: "m" (*virt_addr));
 
+   virt_addr++;
}
 }
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[MIPS] Delete duplicate inclusion of .

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=db15f3626df80cebd69b69494c90528aae483caf
Commit: db15f3626df80cebd69b69494c90528aae483caf
Parent: 1bfa771e610bebb29d8051884ff3672845ac9c00
Author: Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Wed Aug 22 22:48:08 2007 +0100
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:59 2007 +0100

[MIPS] Delete duplicate inclusion of .

Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 drivers/char/lcd.c |1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/char/lcd.c b/drivers/char/lcd.c
index 1f09626..4fe9206 100644
--- a/drivers/char/lcd.c
+++ b/drivers/char/lcd.c
@@ -25,7 +25,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include "lcd.h"
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[MIPS] PCI: Remove __devinit attribute from pcibios_fixup_bus.

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4547d224d29a6a9a81df91858c2e26b7f88e02e1
Commit: 4547d224d29a6a9a81df91858c2e26b7f88e02e1
Parent: db15f3626df80cebd69b69494c90528aae483caf
Author: Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Thu Aug 23 14:12:56 2007 +0100
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:59 2007 +0100

[MIPS] PCI: Remove __devinit attribute from pcibios_fixup_bus.

Since 96bde06a2df1b363206d3cdef53134b84ff37813 pcibios_fixup_bus's caller
pci_scan_child_bus is no longer marked __devinit resulting in this modpost
warning if PCI && !HOTPLUG:

  MODPOST vmlinux.o
WARNING: vmlinux.o(.text+0x158b9c): Section mismatch: reference to 
.init.text:pcibios_fixup_bus (between 'pci_scan_child_bus' and 
'pci_scan_bus_parented')

Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/pci/pci.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
index 99d8f4f..6c2da62 100644
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -251,7 +251,7 @@ static void __devinit pcibios_fixup_device_resources(struct 
pci_dev *dev,
}
 }
 
-void __devinit pcibios_fixup_bus(struct pci_bus *bus)
+void pcibios_fixup_bus(struct pci_bus *bus)
 {
/* Propagate hose info into the subordinate devices.  */
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[MIPS] PCI: Remove __devinit attribute from pcibios_fixup_bus.

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c4aa2563f953d13a9bcf4731b00b0900a45626d7
Commit: c4aa2563f953d13a9bcf4731b00b0900a45626d7
Parent: 4547d224d29a6a9a81df91858c2e26b7f88e02e1
Author: Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Thu Aug 23 14:17:14 2007 +0100
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:59 2007 +0100

[MIPS] PCI: Remove __devinit attribute from pcibios_fixup_bus.

Since 96bde06a2df1b363206d3cdef53134b84ff37813 several callers of
pcibios_resource_to_bus are no longer marked __devinit resulting in a
pile of modpost warnings if PCI && !HOTPLUG:

  MODPOST vmlinux.o
WARNING: vmlinux.o(.text+0x15dde8): Section mismatch: reference to 
.init.text:pcibios_resource_to_bus (between 'pci_map_rom' and 
'pci_map_rom_copy')
WARNING: vmlinux.o(.text+0x15e140): Section mismatch: reference to 
.init.text:pcibios_resource_to_bus (between 'pci_update_resource' and 
'pci_claim_resource')
WARNING: vmlinux.o(.text+0x15f0cc): Section mismatch: reference to 
.init.text:pcibios_resource_to_bus (between 'pci_setup_cardbus' and 
'pci_bus_assign_resources')
WARNING: vmlinux.o(.text+0x15f0f0): Section mismatch: reference to 
.init.text:pcibios_resource_to_bus (between 'pci_setup_cardbus' and 
'pci_bus_assign_resources')
WARNING: vmlinux.o(.text+0x15f114): Section mismatch: reference to 
.init.text:pcibios_resource_to_bus (between 'pci_setup_cardbus' and 
'pci_bus_assign_resources')
WARNING: vmlinux.o(.text+0x15f138): Section mismatch: reference to 
.init.text:pcibios_resource_to_bus (between 'pci_setup_cardbus' and 
'pci_bus_assign_resources')
WARNING: vmlinux.o(.text+0x15f438): Section mismatch: reference to 
.init.text:pcibios_resource_to_bus (between 'pci_bus_assign_resources' and 
'pbus_size_mem')
WARNING: vmlinux.o(.text+0x15f4f4): Section mismatch: reference to 
.init.text:pcibios_resource_to_bus (between 'pci_bus_assign_resources' and 
'pbus_size_mem')

Removing __devinit from pcibios_resource_to_bus make the same necessary
for pcibios_fixup_device_resources as well.

Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/pci/pci.c |5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
index 6c2da62..403487e 100644
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -230,7 +230,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
return pcibios_plat_dev_init(dev);
 }
 
-static void __devinit pcibios_fixup_device_resources(struct pci_dev *dev,
+static void pcibios_fixup_device_resources(struct pci_dev *dev,
struct pci_bus *bus)
 {
/* Update device resources.  */
@@ -282,8 +282,7 @@ pcibios_update_irq(struct pci_dev *dev, int irq)
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
 }
 
-void __devinit
-pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
+void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region 
*region,
 struct resource *res)
 {
struct pci_controller *hose = (struct pci_controller *)dev->sysdata;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[SERIAL]: Fix 32-bit warnings in sunzilog.c and sunsu.c

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4f1296a5169c13b2c1f76c1446aaf361e8519050
Commit: 4f1296a5169c13b2c1f76c1446aaf361e8519050
Parent: 7bcd4dae6261b221108148befee20286c6c3a230
Author: David S. Miller <[EMAIL PROTECTED]>
AuthorDate: Sat Aug 25 15:17:31 2007 -0700
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Sun Aug 26 18:49:11 2007 -0700

[SERIAL]: Fix 32-bit warnings in sunzilog.c and sunsu.c

resource_size_t can be either a u64 or a u32, and we can't
really know for sure, so when printing such a value out
always use long-long printf formatting and cast the argument
to that type.

Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 drivers/serial/sunsu.c|5 +++--
 drivers/serial/sunzilog.c |   14 --
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index 79b1368..e074943 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -1198,10 +1198,11 @@ static int __init sunsu_kbd_ms_init(struct 
uart_sunsu_port *up)
if (up->port.type == PORT_UNKNOWN)
return -ENODEV;
 
-   printk("%s: %s port at %lx, irq %u\n",
+   printk("%s: %s port at %llx, irq %u\n",
   to_of_device(up->port.dev)->node->full_name,
   (up->su_type == SU_PORT_KBD) ? "Keyboard" : "Mouse",
-  up->port.mapbase, up->port.irq);
+  (unsigned long long) up->port.mapbase,
+  up->port.irq);
 
 #ifdef CONFIG_SERIO
serio = &up->serio;
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index 1d262c0..283bef0 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -1431,14 +1431,16 @@ static int __devinit zs_probe(struct of_device *op, 
const struct of_device_id *m
return err;
}
} else {
-   printk(KERN_INFO "%s: Keyboard at MMIO 0x%lx (irq = %d) "
+   printk(KERN_INFO "%s: Keyboard at MMIO 0x%llx (irq = %d) "
   "is a %s\n",
-  op->dev.bus_id, up[0].port.mapbase, op->irqs[0],
-  sunzilog_type (&up[0].port));
-   printk(KERN_INFO "%s: Mouse at MMIO 0x%lx (irq = %d) "
+  op->dev.bus_id,
+  (unsigned long long) up[0].port.mapbase,
+  op->irqs[0], sunzilog_type(&up[0].port));
+   printk(KERN_INFO "%s: Mouse at MMIO 0x%llx (irq = %d) "
   "is a %s\n",
-  op->dev.bus_id, up[1].port.mapbase, op->irqs[0],
-  sunzilog_type (&up[1].port));
+  op->dev.bus_id,
+  (unsigned long long) up[1].port.mapbase,
+  op->irqs[0], sunzilog_type(&up[1].port));
}
 
dev_set_drvdata(&op->dev, &up[0]);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[VIDEO]: Do not prom_halt() in cg3 and bw2 device probe.

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=6c8f5b90bfbe69a27763fb0e181bd2465181446d
Commit: 6c8f5b90bfbe69a27763fb0e181bd2465181446d
Parent: 1bd4b280394cdd14f82efc00808c6d77b097285a
Author: David S. Miller <[EMAIL PROTECTED]>
AuthorDate: Fri Aug 24 22:33:15 2007 -0700
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Sun Aug 26 18:49:08 2007 -0700

[VIDEO]: Do not prom_halt() in cg3 and bw2 device probe.

Just give a normal kernel log message of the problem and
return failure.

Based upon a patch from Mark Fortescue.

Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 drivers/video/bw2.c |   22 +-
 drivers/video/cg3.c |   17 ++---
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c
index 718b9f8..833b10c 100644
--- a/drivers/video/bw2.c
+++ b/drivers/video/bw2.c
@@ -233,9 +233,9 @@ static u8 bw2regs_66hz[] __devinitdata = {
0x10, 0x20, 0
 };
 
-static void __devinit bw2_do_default_mode(struct bw2_par *par,
- struct fb_info *info,
- int *linebytes)
+static int __devinit bw2_do_default_mode(struct bw2_par *par,
+struct fb_info *info,
+int *linebytes)
 {
u8 status, mon;
u8 *p;
@@ -266,17 +266,18 @@ static void __devinit bw2_do_default_mode(struct bw2_par 
*par,
break;
 
case BWTWO_SR_ID_NOCONN:
-   return;
+   return 0;
 
default:
-   prom_printf("bw2: can't handle SR %02x\n",
-   status);
-   prom_halt();
+   printk(KERN_ERR "bw2: can't handle SR %02x\n",
+  status);
+   return -EINVAL;
}
for ( ; *p; p += 2) {
u8 __iomem *regp = &((u8 __iomem *)par->regs)[p[0]];
sbus_writeb(p[1], regp);
}
+   return 0;
 }
 
 static int __devinit bw2_probe(struct of_device *op, const struct of_device_id 
*match)
@@ -312,8 +313,11 @@ static int __devinit bw2_probe(struct of_device *op, const 
struct of_device_id *
if (!par->regs)
goto out_release_fb;
 
-   if (!of_find_property(dp, "width", NULL))
-   bw2_do_default_mode(par, info, &linebytes);
+   if (!of_find_property(dp, "width", NULL)) {
+   err = bw2_do_default_mode(par, info, &linebytes);
+   if (err)
+   goto out_unmap_regs;
+   }
 
par->fbsize = PAGE_ALIGN(linebytes * info->var.yres);
 
diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c
index 5741b46..a5c7fb3 100644
--- a/drivers/video/cg3.c
+++ b/drivers/video/cg3.c
@@ -315,7 +315,7 @@ static u_char cg3_dacvals[] __devinitdata = {
4, 0xff,5, 0x00,6, 0x70,7, 0x00,0
 };
 
-static void __devinit cg3_do_default_mode(struct cg3_par *par)
+static int __devinit cg3_do_default_mode(struct cg3_par *par)
 {
enum cg3_type type;
u8 *p;
@@ -332,10 +332,9 @@ static void __devinit cg3_do_default_mode(struct cg3_par 
*par)
else
type = CG3_AT_66HZ;
} else {
-   prom_printf("cgthree: can't handle SR %02x\n",
-   status);
-   prom_halt();
-   return;
+   printk(KERN_ERR "cgthree: can't handle SR %02x\n",
+  status);
+   return -EINVAL;
}
}
 
@@ -351,6 +350,7 @@ static void __devinit cg3_do_default_mode(struct cg3_par 
*par)
regp = (u8 __iomem *)&par->regs->cmap.control;
sbus_writeb(p[1], regp);
}
+   return 0;
 }
 
 static int __devinit cg3_probe(struct of_device *op,
@@ -400,8 +400,11 @@ static int __devinit cg3_probe(struct of_device *op,
 
cg3_blank(0, info);
 
-   if (!of_find_property(dp, "width", NULL))
-   cg3_do_default_mode(par);
+   if (!of_find_property(dp, "width", NULL)) {
+   err = cg3_do_default_mode(par);
+   if (err)
+   goto out_unmap_screen;
+   }
 
if (fb_alloc_cmap(&info->cmap, 256, 0))
goto out_unmap_screen;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html