Commit 6ed7f5b7 authored by Jeff Garzik's avatar Jeff Garzik

Merge mandrakesoft.com:/home/jgarzik/repo/linus-2.5

into mandrakesoft.com:/home/jgarzik/repo/net-drivers-2.5
parents cc777197 cc8f2609
VERSION = 2
PATCHLEVEL = 5
SUBLEVEL = 37
SUBLEVEL = 38
EXTRAVERSION =
# *DOCUMENTATION*
......
......@@ -174,6 +174,10 @@ static int show_partition(struct seq_file *part, void *v)
if (sgp == gendisk_head)
seq_puts(part, "major minor #blocks name\n\n");
/* Don't show non-partitionable devices or empty devices */
if (!sgp->minor_shift || !get_capacity(sgp))
return 0;
/* show the full disk and all non-0 size partitions of it */
seq_printf(part, "%4d %4d %10ld %s\n",
sgp->major, sgp->first_minor,
......
......@@ -27,6 +27,7 @@ void __init free_area_init_node(int nid, pg_data_t *pgdat, struct page *pmap,
{
unsigned long size;
pgdat = &contig_page_data;
contig_page_data.node_id = 0;
contig_page_data.node_start_pfn = node_start_pfn;
calculate_totalpages (&contig_page_data, zones_size, zholes_size);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment