/spare/repo/libata-dev branch 'master' (2fcf5225) · Commits · e / devices / android_kernel_sony_msm8998

Documentation/feature-removal-schedule.txt

+12 −0

Original line number	Diff line number	Diff line
		@@ -135,3 +135,15 @@ Why: With the 16-bit PCMCIA subsystem now behaving (almost) like a
		pcmciautils package available at
		http://kernel.org/pub/linux/utils/kernel/pcmcia/
		Who: Dominik Brodowski <linux@brodo.de>

		---------------------------

		What: ip_queue and ip6_queue (old ipv4-only and ipv6-only netfilter queue)
		When: December 2005
		Why: This interface has been obsoleted by the new layer3-independent
		"nfnetlink_queue". The Kernel interface is compatible, so the old
		ip[6]tables "QUEUE" targets still work and will transparently handle
		all packets into nfnetlink queue number 0. Userspace users will have
		to link against API-compatible library on top of libnfnetlink_queue
		instead of the current 'libipq'.
		Who: Harald Welte <laforge@netfilter.org>

arch/ppc/Makefile

+10 −1

Original line number	Diff line number	Diff line
		@@ -21,11 +21,13 @@ CC := $(CC) -m32
		endif

		LDFLAGS_vmlinux := -Ttext $(KERNELLOAD) -Bstatic
		CPPFLAGS += -Iarch/$(ARCH)
		CPPFLAGS += -Iarch/$(ARCH) -Iinclude3
		AFLAGS += -Iarch/$(ARCH)
		CFLAGS += -Iarch/$(ARCH) -msoft-float -pipe \
		-ffixed-r2 -mmultiple
		CPP = $(CC) -E $(CFLAGS)
		# Temporary hack until we have migrated to asm-powerpc
		LINUXINCLUDE += -Iinclude3

		CHECKFLAGS += -D__powerpc__

		@@ -101,6 +103,7 @@ endef

		archclean:
		$(Q)$(MAKE) $(clean)=arch/ppc/boot
		$(Q)rm -rf include3

		prepare: include/asm-$(ARCH)/offsets.h checkbin

		@@ -110,6 +113,12 @@ arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
		include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
		$(call filechk,gen-asm-offsets)

		# Temporary hack until we have migrated to asm-powerpc
		include/asm: include3/asm
		include3/asm:
		$(Q)if [ ! -d include3 ]; then mkdir -p include3; fi
		$(Q)ln -fsn $(srctree)/include/asm-powerpc include3/asm

		# Use the file '.tmp_gas_check' for binutils tests, as gas won't output
		# to stdout and these checks are run even on install targets.
		TOUT := .tmp_gas_check

arch/ppc/boot/utils/addRamDisk.c

deleted100644 → 0

+0 −203

Original line number	Diff line number	Diff line
		#include <stdio.h>
		#include <stdlib.h>
		#include <netinet/in.h>
		#include <unistd.h>
		#include <sys/types.h>
		#include <sys/stat.h>
		#include <string.h>

		#define ElfHeaderSize (64 * 1024)
		#define ElfPages (ElfHeaderSize / 4096)
		#define KERNELBASE (0xc0000000)

		void get4k(FILE file, char buf )
		{
		unsigned j;
		unsigned num = fread(buf, 1, 4096, file);
		for ( j=num; j<4096; ++j )
		buf[j] = 0;
		}

		void put4k(FILE file, char buf )
		{
		fwrite(buf, 1, 4096, file);
		}

		void death(const char msg, FILE fdesc, const char *fname)
		{
		printf(msg);
		fclose(fdesc);
		unlink(fname);
		exit(1);
		}

		int main(int argc, char **argv)
		{
		char inbuf[4096];
		FILE *ramDisk = NULL;
		FILE *inputVmlinux = NULL;
		FILE *outputVmlinux = NULL;
		unsigned i = 0;
		u_int32_t ramFileLen = 0;
		u_int32_t ramLen = 0;
		u_int32_t roundR = 0;
		u_int32_t kernelLen = 0;
		u_int32_t actualKernelLen = 0;
		u_int32_t round = 0;
		u_int32_t roundedKernelLen = 0;
		u_int32_t ramStartOffs = 0;
		u_int32_t ramPages = 0;
		u_int32_t roundedKernelPages = 0;
		u_int32_t hvReleaseData = 0;
		u_int32_t eyeCatcher = 0xc8a5d9c4;
		u_int32_t naca = 0;
		u_int32_t xRamDisk = 0;
		u_int32_t xRamDiskSize = 0;
		if ( argc < 2 ) {
		printf("Name of RAM disk file missing.\n");
		exit(1);
		}

		if ( argc < 3 ) {
		printf("Name of vmlinux file missing.\n");
		exit(1);
		}

		if ( argc < 4 ) {
		printf("Name of vmlinux output file missing.\n");
		exit(1);
		}

		ramDisk = fopen(argv[1], "r");
		if ( ! ramDisk ) {
		printf("RAM disk file \"%s\" failed to open.\n", argv[1]);
		exit(1);
		}
		inputVmlinux = fopen(argv[2], "r");
		if ( ! inputVmlinux ) {
		printf("vmlinux file \"%s\" failed to open.\n", argv[2]);
		exit(1);
		}
		outputVmlinux = fopen(argv[3], "w+");
		if ( ! outputVmlinux ) {
		printf("output vmlinux file \"%s\" failed to open.\n", argv[3]);
		exit(1);
		}
		fseek(ramDisk, 0, SEEK_END);
		ramFileLen = ftell(ramDisk);
		fseek(ramDisk, 0, SEEK_SET);
		printf("%s file size = %d\n", argv[1], ramFileLen);

		ramLen = ramFileLen;

		roundR = 4096 - (ramLen % 4096);
		if ( roundR ) {
		printf("Rounding RAM disk file up to a multiple of 4096, adding %d\n", roundR);
		ramLen += roundR;
		}

		printf("Rounded RAM disk size is %d\n", ramLen);
		fseek(inputVmlinux, 0, SEEK_END);
		kernelLen = ftell(inputVmlinux);
		fseek(inputVmlinux, 0, SEEK_SET);
		printf("kernel file size = %d\n", kernelLen);
		if ( kernelLen == 0 ) {
		printf("You must have a linux kernel specified as argv[2]\n");
		exit(1);
		}

		actualKernelLen = kernelLen - ElfHeaderSize;

		printf("actual kernel length (minus ELF header) = %d\n", actualKernelLen);

		round = actualKernelLen % 4096;
		roundedKernelLen = actualKernelLen;
		if ( round )
		roundedKernelLen += (4096 - round);

		printf("actual kernel length rounded up to a 4k multiple = %d\n", roundedKernelLen);

		ramStartOffs = roundedKernelLen;
		ramPages = ramLen / 4096;

		printf("RAM disk pages to copy = %d\n", ramPages);

		// Copy 64K ELF header
		for (i=0; i<(ElfPages); ++i) {
		get4k( inputVmlinux, inbuf );
		put4k( outputVmlinux, inbuf );
		}

		roundedKernelPages = roundedKernelLen / 4096;

		fseek(inputVmlinux, ElfHeaderSize, SEEK_SET);

		for ( i=0; i<roundedKernelPages; ++i ) {
		get4k( inputVmlinux, inbuf );
		put4k( outputVmlinux, inbuf );
		}

		for ( i=0; i<ramPages; ++i ) {
		get4k( ramDisk, inbuf );
		put4k( outputVmlinux, inbuf );
		}

		/* Close the input files */
		fclose(ramDisk);
		fclose(inputVmlinux);
		/* And flush the written output file */
		fflush(outputVmlinux);

		/* fseek to the hvReleaseData pointer */
		fseek(outputVmlinux, ElfHeaderSize + 0x24, SEEK_SET);
		if (fread(&hvReleaseData, 4, 1, outputVmlinux) != 1) {
		death("Could not read hvReleaseData pointer\n", outputVmlinux, argv[3]);
		}
		hvReleaseData = ntohl(hvReleaseData); /* Convert to native int */
		printf("hvReleaseData is at %08x\n", hvReleaseData);

		/* fseek to the hvReleaseData */
		fseek(outputVmlinux, ElfHeaderSize + hvReleaseData, SEEK_SET);
		if (fread(inbuf, 0x40, 1, outputVmlinux) != 1) {
		death("Could not read hvReleaseData\n", outputVmlinux, argv[3]);
		}
		/* Check hvReleaseData sanity */
		if (memcmp(inbuf, &eyeCatcher, 4) != 0) {
		death("hvReleaseData is invalid\n", outputVmlinux, argv[3]);
		}
		/* Get the naca pointer */
		naca = ntohl(((u_int32_t ) &inbuf[0x0c])) - KERNELBASE;
		printf("naca is at %08x\n", naca);

		/* fseek to the naca */
		fseek(outputVmlinux, ElfHeaderSize + naca, SEEK_SET);
		if (fread(inbuf, 0x18, 1, outputVmlinux) != 1) {
		death("Could not read naca\n", outputVmlinux, argv[3]);
		}
		xRamDisk = ntohl(((u_int32_t ) &inbuf[0x0c]));
		xRamDiskSize = ntohl(((u_int32_t ) &inbuf[0x14]));
		/* Make sure a RAM disk isn't already present */
		if ((xRamDisk != 0) \|\| (xRamDiskSize != 0)) {
		death("RAM disk is already attached to this kernel\n", outputVmlinux, argv[3]);
		}
		/* Fill in the values */
		((u_int32_t ) &inbuf[0x0c]) = htonl(ramStartOffs);
		((u_int32_t ) &inbuf[0x14]) = htonl(ramPages);

		/* Write out the new naca */
		fflush(outputVmlinux);
		fseek(outputVmlinux, ElfHeaderSize + naca, SEEK_SET);
		if (fwrite(inbuf, 0x18, 1, outputVmlinux) != 1) {
		death("Could not write naca\n", outputVmlinux, argv[3]);
		}
		printf("RAM Disk of 0x%x pages size is attached to the kernel at offset 0x%08x\n",
		ramPages, ramStartOffs);

		/* Done */
		fclose(outputVmlinux);
		/* Set permission to executable */
		chmod(argv[3], S_IRUSR\|S_IWUSR\|S_IXUSR\|S_IRGRP\|S_IXGRP\|S_IROTH\|S_IXOTH);

		return 0;
		}

arch/ppc64/Kconfig

+34 −40

Original line number	Diff line number	Diff line
		@@ -302,12 +302,6 @@ config GENERIC_HARDIRQS
		bool
		default y

		config MSCHUNKS
		bool
		depends on PPC_ISERIES
		default y


		config PPC_RTAS
		bool
		depends on PPC_PSERIES \|\| PPC_BPA
		@@ -350,13 +344,46 @@ config SECCOMP

		If unsure, say Y. Only embedded should say N here.

		source "fs/Kconfig.binfmt"

		config HOTPLUG_CPU
		bool "Support for hot-pluggable CPUs"
		depends on SMP && EXPERIMENTAL && (PPC_PSERIES \|\| PPC_PMAC)
		select HOTPLUG
		---help---
		Say Y here to be able to turn CPUs off and on.

		Say N if you are unsure.

		config PROC_DEVICETREE
		bool "Support for Open Firmware device tree in /proc"
		depends on !PPC_ISERIES
		help
		This option adds a device-tree directory under /proc which contains
		an image of the device tree that the kernel copies from Open
		Firmware. If unsure, say Y here.

		config CMDLINE_BOOL
		bool "Default bootloader kernel arguments"
		depends on !PPC_ISERIES

		config CMDLINE
		string "Initial kernel command string"
		depends on CMDLINE_BOOL
		default "console=ttyS0,9600 console=tty0 root=/dev/sda2"
		help
		On some platforms, there is currently no way for the boot loader to
		pass arguments to the kernel. For these platforms, you can supply
		some command-line options at build time by entering them here. In
		most cases you will need to specify the root device here.

		endmenu

		config ISA_DMA_API
		bool
		default y

		menu "General setup"
		menu "Bus Options"

		config ISA
		bool
		@@ -389,45 +416,12 @@ config PCI_DOMAINS
		bool
		default PCI

		source "fs/Kconfig.binfmt"

		source "drivers/pci/Kconfig"

		config HOTPLUG_CPU
		bool "Support for hot-pluggable CPUs"
		depends on SMP && EXPERIMENTAL && (PPC_PSERIES \|\| PPC_PMAC)
		select HOTPLUG
		---help---
		Say Y here to be able to turn CPUs off and on.

		Say N if you are unsure.

		source "drivers/pcmcia/Kconfig"

		source "drivers/pci/hotplug/Kconfig"

		config PROC_DEVICETREE
		bool "Support for Open Firmware device tree in /proc"
		depends on !PPC_ISERIES
		help
		This option adds a device-tree directory under /proc which contains
		an image of the device tree that the kernel copies from Open
		Firmware. If unsure, say Y here.

		config CMDLINE_BOOL
		bool "Default bootloader kernel arguments"
		depends on !PPC_ISERIES

		config CMDLINE
		string "Initial kernel command string"
		depends on CMDLINE_BOOL
		default "console=ttyS0,9600 console=tty0 root=/dev/sda2"
		help
		On some platforms, there is currently no way for the boot loader to
		pass arguments to the kernel. For these platforms, you can supply
		some command-line options at build time by entering them here. In
		most cases you will need to specify the root device here.

		endmenu

		source "net/Kconfig"

arch/ppc64/Makefile

+9 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,8 @@ LDFLAGS := -m elf64ppc
		LDFLAGS_vmlinux := -Bstatic -e $(KERNELLOAD) -Ttext $(KERNELLOAD)
		CFLAGS += -msoft-float -pipe -mminimal-toc -mtraceback=none \
		-mcall-aixdesc
		# Temporary hack until we have migrated to asm-powerpc
		CPPFLAGS += -Iinclude3

		GCC_VERSION := $(call cc-version)
		GCC_BROKEN_VEC := $(shell if [ $(GCC_VERSION) -lt 0400 ] ; then echo "y"; fi ;)
		@@ -112,6 +114,7 @@ all: $(KBUILD_IMAGE)

		archclean:
		$(Q)$(MAKE) $(clean)=$(boot)
		$(Q)rm -rf include3

		prepare: include/asm-ppc64/offsets.h

		@@ -121,6 +124,12 @@ arch/ppc64/kernel/asm-offsets.s: include/asm include/linux/version.h \
		include/asm-ppc64/offsets.h: arch/ppc64/kernel/asm-offsets.s
		$(call filechk,gen-asm-offsets)

		# Temporary hack until we have migrated to asm-powerpc
		include/asm: include3/asm
		include3/asm:
		$(Q)if [ ! -d include3 ]; then mkdir -p include3; fi;
		$(Q)ln -fsn $(srctree)/include/asm-powerpc include3/asm

		define archhelp
		echo '* zImage - Compressed kernel image (arch/$(ARCH)/boot/zImage)'
		echo ' zImage.initrd- Compressed kernel image with initrd attached,'