From 8e36d7bd8dd7917c37c0d609969cf313bca79fff Mon Sep 17 00:00:00 2001 From: Len Brown Date: Thu, 13 Dec 2007 22:12:38 -0500 Subject: [PATCH] --- yaml --- r: 74840 b: refs/heads/master c: 6790acb14d264d874ff8cbae1a72e72883ec3678 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/numa.c | 4 ++-- trunk/drivers/acpi/video.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 8c7bbfa5f0b4..b2ad50e96ddf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 56a185b43be05e48da7428e6a1d3e2585b232b1d +refs/heads/master: 6790acb14d264d874ff8cbae1a72e72883ec3678 diff --git a/trunk/drivers/acpi/numa.c b/trunk/drivers/acpi/numa.c index ab04d848b19d..0822d9fc1cb4 100644 --- a/trunk/drivers/acpi/numa.c +++ b/trunk/drivers/acpi/numa.c @@ -38,9 +38,9 @@ ACPI_MODULE_NAME("numa"); static nodemask_t nodes_found_map = NODE_MASK_NONE; /* maps to convert between proximity domain and logical node ID */ -static int __cpuinitdata pxm_to_node_map[MAX_PXM_DOMAINS] +static int pxm_to_node_map[MAX_PXM_DOMAINS] = { [0 ... MAX_PXM_DOMAINS - 1] = NID_INVAL }; -static int __cpuinitdata node_to_pxm_map[MAX_NUMNODES] +static int node_to_pxm_map[MAX_NUMNODES] = { [0 ... MAX_NUMNODES - 1] = PXM_INVAL }; int pxm_to_node(int pxm) diff --git a/trunk/drivers/acpi/video.c b/trunk/drivers/acpi/video.c index 44a0d9ba9bd6..bd77e81e81c1 100644 --- a/trunk/drivers/acpi/video.c +++ b/trunk/drivers/acpi/video.c @@ -577,7 +577,7 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device) struct acpi_video_device_brightness *br = NULL; - memset(&device->cap, 0, 4); + memset(&device->cap, 0, sizeof(device->cap)); if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_ADR", &h_dummy1))) { device->cap._ADR = 1; @@ -697,7 +697,7 @@ static void acpi_video_bus_find_cap(struct acpi_video_bus *video) { acpi_handle h_dummy1; - memset(&video->cap, 0, 4); + memset(&video->cap, 0, sizeof(video->cap)); if (ACPI_SUCCESS(acpi_get_handle(video->device->handle, "_DOS", &h_dummy1))) { video->cap._DOS = 1; }