Revision 475049809977bf3975d78f2d2fd992e19ce2d59e authored by Roel Kluin on 10 March 2009, 19:55:45 UTC, committed by Linus Torvalds on 10 March 2009, 22:55:10 UTC
get_nid_for_pfn() returns int Presumably the (nid < 0) case has never happened. We do know that it is happening on one system while creating a symlink for a memory section so it should also happen on the same system if unregister_mem_sect_under_nodes() were called to remove the same symlink. The test was actually added in response to a problem with an earlier version reported by Yasunori Goto where one or more of the leading pages of a memory section on the 2nd node of one of his systems was uninitialized because I believe they coincided with a memory hole. That earlier version did not ignore uninitialized pages and determined the nid by considering only the 1st page of each memory section. This caused the symlink to the 1st memory section on the 2nd node to be incorrectly created in /sys/devices/system/node/node0 instead of /sys/devices/system/node/node1. The problem was fixed by adding the test to skip over uninitialized pages. I suspect we have not seen any reports of the non-removal of a symlink due to the incorrect declaration of the nid variable in unregister_mem_sect_under_nodes() because - systems where a memory section could have an uninitialized range of leading pages are probably rare. - memory remove is probably not done very frequently on the systems that are capable of demonstrating the problem. - lingering symlink(s) that should have been removed may have simply gone unnoticed. [garyhade@us.ibm.com: wrote changelog] Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Cc: Gary Hade <garyhade@us.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 1abaf33
carminefb.h
#ifndef CARMINE_CARMINE_H
#define CARMINE_CARMINE_H
#define CARMINE_MEMORY_BAR 2
#define CARMINE_CONFIG_BAR 3
#define MAX_DISPLAY 2
#define CARMINE_DISPLAY_MEM (800 * 600 * 4)
#define CARMINE_TOTAL_DIPLAY_MEM (CARMINE_DISPLAY_MEM * MAX_DISPLAY)
#define CARMINE_USE_DISPLAY0 (1 << 0)
#define CARMINE_USE_DISPLAY1 (1 << 1)
/*
* This values work on the eval card. Custom boards may use different timings,
* here an example :)
*/
/* DRAM initialization values */
#ifdef CONFIG_FB_CARMINE_DRAM_EVAL
#define CARMINE_DFLT_IP_CLOCK_ENABLE (0x03ff)
#define CARMINE_DFLT_IP_DCTL_ADD (0x05c3)
#define CARMINE_DFLT_IP_DCTL_MODE (0x0121)
#define CARMINE_DFLT_IP_DCTL_EMODE (0x8000)
#define CARMINE_DFLT_IP_DCTL_SET_TIME1 (0x4749)
#define CARMINE_DFLT_IP_DCTL_SET_TIME2 (0x2a22)
#define CARMINE_DFLT_IP_DCTL_REFRESH (0x0042)
#define CARMINE_DFLT_IP_DCTL_STATES (0x0003)
#define CARMINE_DFLT_IP_DCTL_RESERVE0 (0x0020)
#define CARMINE_DFLT_IP_DCTL_FIFO_DEPTH (0x000f)
#define CARMINE_DFLT_IP_DCTL_RESERVE2 (0x0000)
#define CARMINE_DFLT_IP_DCTL_DDRIF1 (0x6646)
#define CARMINE_DFLT_IP_DCTL_DDRIF2 (0x0055)
#define CARMINE_DFLT_IP_DCTL_MODE_AFT_RST (0x0021)
#define CARMINE_DFLT_IP_DCTL_STATES_AFT_RST (0x0002)
#define CARMINE_DFLT_IP_DCTL_IO_CONT0 (0x0555)
#define CARMINE_DFLT_IP_DCTL_IO_CONT1 (0x0555)
#define CARMINE_DCTL_DLL_RESET (1)
#endif
#ifdef CONFIG_CARMINE_DRAM_CUSTOM
#define CARMINE_DFLT_IP_CLOCK_ENABLE (0x03ff)
#define CARMINE_DFLT_IP_DCTL_ADD (0x03b2)
#define CARMINE_DFLT_IP_DCTL_MODE (0x0161)
#define CARMINE_DFLT_IP_DCTL_EMODE (0x8000)
#define CARMINE_DFLT_IP_DCTL_SET_TIME1 (0x2628)
#define CARMINE_DFLT_IP_DCTL_SET_TIME2 (0x1a09)
#define CARMINE_DFLT_IP_DCTL_REFRESH (0x00fe)
#define CARMINE_DFLT_IP_DCTL_STATES (0x0003)
#define CARMINE_DFLT_IP_DCTL_RESERVE0 (0x0020)
#define CARMINE_DFLT_IP_DCTL_FIFO_DEPTH (0x000f)
#define CARMINE_DFLT_IP_DCTL_RESERVE2 (0x0000)
#define CARMINE_DFLT_IP_DCTL_DDRIF1 (0x0646)
#define CARMINE_DFLT_IP_DCTL_DDRIF2 (0x55aa)
#define CARMINE_DFLT_IP_DCTL_MODE_AFT_RST (0x0061)
#define CARMINE_DFLT_IP_DCTL_STATES_AFT_RST (0x0002)
#define CARMINE_DFLT_IP_DCTL_IO_CONT0 (0x0555)
#define CARMINE_DFLT_IP_DCTL_IO_CONT1 (0x0555)
#define CARMINE_DCTL_DLL_RESET (1)
#endif
#endif
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...