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

Commit 616ad8c4 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into x86/defconfig

parents 99809963 b380b0d4

Documentation/ABI/testing/sysfs-firmware-sgi_uv

0 → 100644
+27 −0
Original line number Diff line number Diff line 
What:		/sys/firmware/sgi_uv/

Date:		August 2008

Contact:	Russ Anderson <rja@sgi.com>

Description:

		The /sys/firmware/sgi_uv directory contains information

		about the SGI UV platform.



		Under that directory are a number of files:



			partition_id

			coherence_id



		The partition_id entry contains the partition id.

		SGI UV systems can be partitioned into multiple physical

		machines, which each partition running a unique copy

		of the operating system.  Each partition will have a unique

		partition id.  To display the partition id, use the command:



			cat /sys/firmware/sgi_uv/partition_id



		The coherence_id entry contains the coherence id.

		A partitioned SGI UV system can have one or more coherence

		domain.  The coherence id indicates which coherence domain

		this partition is in.  To display the coherence id, use the

		command:



			cat /sys/firmware/sgi_uv/coherence_id

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 @@ static int __init init_procfs_example(void) 
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