Menu
▾
▴
[Hackndev-commit] SF.net SVN: hackndev: [1313] linux4palm/linux/branches/ cleanup-branch-never-commit
|
From: <hap...@us...> - 2007-09-13 18:26:19
|
Revision: 1313
http://hackndev.svn.sourceforge.net/hackndev/?rev=1313&view=rev
Author: happy-slapin
Date: 2007-09-13 11:25:09 -0700 (Thu, 13 Sep 2007)
Log Message:
-----------
Cleanup
Modified Paths:
--------------
linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/mach-pxa/pxa27x.c
linux4palm/linux/branches/cleanup-branch-never-commit/arch/sh/kernel/process.c
linux4palm/linux/branches/cleanup-branch-never-commit/init/do_mounts_rd.c
linux4palm/linux/branches/cleanup-branch-never-commit/init/main.c
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/mach-pxa/pxa27x.c
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/mach-pxa/pxa27x.c 2007-09-13 18:21:07 UTC (rev 1312)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/arch/arm/mach-pxa/pxa27x.c 2007-09-13 18:25:09 UTC (rev 1313)
@@ -198,32 +198,6 @@
.resource = pxa27x_ohci_resources,
};
-static struct resource pxacamera_resources[] = {
- [0] = {
- .start = 0x50000000,
- .end = 0x50000fff,
- .flags = IORESOURCE_MEM,
- },
- [1] = {
- .start = IRQ_CAMERA,
- .end = IRQ_CAMERA,
- .flags = IORESOURCE_IRQ,
- },
-};
-
-static u64 pxa_camera_dmamask = 0xffffffffUL;
-
-static struct platform_device pxacamera_device = {
- .name = "pxa-camera",
- .id = -1, //check this
- .dev = {
- .dma_mask = &pxa_camera_dmamask,
- .coherent_dma_mask = 0xffffffff,
- },
- .num_resources = ARRAY_SIZE(pxacamera_resources),
- .resource = pxacamera_resources,
-};
-
void __init pxa_set_ohci_info(struct pxaohci_platform_data *info)
{
ohci_device.dev.platform_data = info;
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/arch/sh/kernel/process.c
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/arch/sh/kernel/process.c 2007-09-13 18:21:07 UTC (rev 1312)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/arch/sh/kernel/process.c 2007-09-13 18:25:09 UTC (rev 1313)
@@ -9,26 +9,22 @@
* Copyright (C) 2006 Lineo Solutions Inc. support SH4A UBC
* Copyright (C) 2002 - 2006 Paul Mundt
*/
-
#include <linux/module.h>
#include <linux/mm.h>
#include <linux/elfcore.h>
#include <linux/pm.h>
#include <linux/kallsyms.h>
#include <linux/kexec.h>
-
#include <asm/uaccess.h>
#include <asm/mmu_context.h>
#include <asm/ubc.h>
static int hlt_counter;
-
int ubc_usercnt = 0;
#define HARD_IDLE_TIMEOUT (HZ / 3)
void (*pm_idle)(void);
-
void (*pm_power_off)(void);
EXPORT_SYMBOL(pm_power_off);
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/init/do_mounts_rd.c
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/init/do_mounts_rd.c 2007-09-13 18:21:07 UTC (rev 1312)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/init/do_mounts_rd.c 2007-09-13 18:25:09 UTC (rev 1313)
@@ -5,14 +5,6 @@
#include <linux/ext2_fs.h>
#include <linux/romfs_fs.h>
#include <linux/cramfs_fs.h>
-
-#ifdef CONFIG_SQUASHFS_LZMA
- #include <linux/squashfslzma_fs.h>
- #include <../fs/squashfs_lzma/sqmagic.h>
-#else
- #include <linux/squashfs_fs.h>
-#endif
-
#include <linux/initrd.h>
#include <linux/string.h>
@@ -47,8 +39,6 @@
* numbers could not be found.
*
* We currently check for the following magic numbers:
- * squashfs
- * squashfs-lzma
* minix
* ext2
* romfs
@@ -63,11 +53,6 @@
struct ext2_super_block *ext2sb;
struct romfs_super_block *romfsb;
struct cramfs_super *cramfsb;
- struct squashfs_super_block *squashfsb;
-#ifdef CONFIG_SQUASHFS_LZMA
- struct squashfs_super_block *squashfslzmab;
-#endif
-
int nblocks = -1;
unsigned char *buf;
@@ -79,10 +64,6 @@
ext2sb = (struct ext2_super_block *) buf;
romfsb = (struct romfs_super_block *) buf;
cramfsb = (struct cramfs_super *) buf;
- squashfsb = (struct squashfs_super_block *) buf;
-#ifdef CONFIG_SQUASHFS_LZMA
- squashfslzmab = (struct squashfs_super_block *) buf;
-#endif
memset(buf, 0xe5, size);
/*
@@ -120,32 +101,6 @@
goto done;
}
- /* squashfs is at block zero too */
- if (squashfsb->s_magic == SQUASHFS_MAGIC) {
- printk(KERN_NOTICE
- "RAMDISK: squashfs filesystem found at block %d\n",
- start_block);
- if (squashfsb->s_major < 3)
- nblocks = (squashfsb->bytes_used_2+BLOCK_SIZE-1)>>BLOCK_SIZE_BITS;
- else
- nblocks = (squashfsb->bytes_used+BLOCK_SIZE-1)>>BLOCK_SIZE_BITS;
- goto done;
- }
-
-#ifdef CONFIG_SQUASHFS_LZMA
- /* squashfslzma is at block zero too */
- if (squashfslzmab->s_magic == SQUASHFS_MAGIC_LZMA) {
- printk(KERN_NOTICE
- "RAMDISK: SquashFS-LZMA filesystem found at block %d\n",
- start_block);
- if (squashfslzmab->s_major < 3)
- nblocks = (squashfslzmab->bytes_used_2+BLOCK_SIZE-1)>>BLOCK_SIZE_BITS;
- else
- nblocks = (squashfslzmab->bytes_used+BLOCK_SIZE-1)>>BLOCK_SIZE_BITS;
- goto done;
- }
-#endif
-
/*
* Read block 1 to test for minix and ext2 superblock
*/
Modified: linux4palm/linux/branches/cleanup-branch-never-commit/init/main.c
===================================================================
--- linux4palm/linux/branches/cleanup-branch-never-commit/init/main.c 2007-09-13 18:21:07 UTC (rev 1312)
+++ linux4palm/linux/branches/cleanup-branch-never-commit/init/main.c 2007-09-13 18:25:09 UTC (rev 1313)
@@ -728,13 +728,11 @@
spawn_softlockup_task();
}
-#if !defined(CONFIG_LAB)
static void run_init_process(char *init_filename)
{
argv_init[0] = init_filename;
kernel_execve(init_filename, argv_init, envp_init);
}
-#endif
/* This is a non __init function. Force it to be noinline otherwise gcc
* makes it inline to init() and it becomes part of init.text section
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
