Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b53b575 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/urgent' into x86/pat 



Conflicts:
	arch/x86/mm/pageattr.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents ab7e7924 38cc1c3d

Documentation/DocBook/Makefile

+7 −0
Original line number Diff line number Diff line
@@ -102,6 +102,13 @@ C-procfs-example = procfs_example.xml 
C-procfs-example2 = $(addprefix $(obj)/,$(C-procfs-example))

$(obj)/procfs-guide.xml: $(C-procfs-example2)



# List of programs to build

##oops, this is a kernel module::hostprogs-y := procfs_example

obj-m += procfs_example.o



# Tell kbuild to always build the programs

always := $(hostprogs-y)



notfoundtemplate = echo "*** You have to install docbook-utils or xmlto ***"; \

		   exit 1

db2xtemplate = db2TYPE -o $(dir $@) $<

Documentation/DocBook/procfs_example.c

+1 −3
Original line number Diff line number Diff line
@@ -189,8 +189,6 @@ static int __init init_procfs_example(void) 
	return 0;



no_symlink:

	remove_proc_entry("tty", example_dir);

no_tty:

	remove_proc_entry("bar", example_dir);

no_bar:

	remove_proc_entry("foo", example_dir);
@@ -206,7 +204,6 @@ out: 
static void __exit cleanup_procfs_example(void)

{

	remove_proc_entry("jiffies_too", example_dir);

	remove_proc_entry("tty", example_dir);

	remove_proc_entry("bar", example_dir);

	remove_proc_entry("foo", example_dir);

	remove_proc_entry("jiffies", example_dir);
@@ -222,3 +219,4 @@ module_exit(cleanup_procfs_example); 


MODULE_AUTHOR("Erik Mouw");

MODULE_DESCRIPTION("procfs examples");

MODULE_LICENSE("GPL");

Documentation/Makefile

0 → 100644
+3 −0
Original line number Diff line number Diff line 
obj-m := DocBook/ accounting/ auxdisplay/ connector/ \

	filesystems/configfs/ ia64/ networking/ \

	pcmcia/ spi/ video4linux/ vm/ watchdog/src/

Documentation/accounting/Makefile

0 → 100644
+10 −0
Original line number Diff line number Diff line 
# kbuild trick to avoid linker error. Can be omitted if a module is built.

obj- := dummy.o



# List of programs to build

hostprogs-y := getdelays



# Tell kbuild to always build the programs

always := $(hostprogs-y)



HOSTCFLAGS_getdelays.o += -I$(objtree)/usr/include

Documentation/accounting/getdelays.c

+17 −8
Original line number Diff line number Diff line
@@ -201,13 +201,19 @@ void print_delayacct(struct taskstats *t) 
	       "RECLAIM  %12s%15s\n"

	       "      %15llu%15llu\n",

	       "count", "real total", "virtual total", "delay total",

	       t->cpu_count, t->cpu_run_real_total, t->cpu_run_virtual_total,

	       t->cpu_delay_total,

	       (unsigned long long)t->cpu_count,

	       (unsigned long long)t->cpu_run_real_total,

	       (unsigned long long)t->cpu_run_virtual_total,

	       (unsigned long long)t->cpu_delay_total,

	       "count", "delay total",

	       t->blkio_count, t->blkio_delay_total,

	       "count", "delay total", t->swapin_count, t->swapin_delay_total,

	       (unsigned long long)t->blkio_count,

	       (unsigned long long)t->blkio_delay_total,

	       "count", "delay total",

	       t->freepages_count, t->freepages_delay_total);

	       (unsigned long long)t->swapin_count,

	       (unsigned long long)t->swapin_delay_total,

	       "count", "delay total",

	       (unsigned long long)t->freepages_count,

	       (unsigned long long)t->freepages_delay_total);

}



void task_context_switch_counts(struct taskstats *t)
@@ -215,14 +221,17 @@ void task_context_switch_counts(struct taskstats *t) 
	printf("\n\nTask   %15s%15s\n"

	       "       %15llu%15llu\n",

	       "voluntary", "nonvoluntary",

	       t->nvcsw, t->nivcsw);

	       (unsigned long long)t->nvcsw, (unsigned long long)t->nivcsw);

}



void print_cgroupstats(struct cgroupstats *c)

{

	printf("sleeping %llu, blocked %llu, running %llu, stopped %llu, "

		"uninterruptible %llu\n", c->nr_sleeping, c->nr_io_wait,

		c->nr_running, c->nr_stopped, c->nr_uninterruptible);

		"uninterruptible %llu\n", (unsigned long long)c->nr_sleeping,

		(unsigned long long)c->nr_io_wait,

		(unsigned long long)c->nr_running,

		(unsigned long long)c->nr_stopped,

		(unsigned long long)c->nr_uninterruptible);

}