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

Commit 1e72fe1f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'imx/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes 

* 'imx/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6

:
  ARM: dts: imx51-babbage: fix esdhc cd/wp properties
  ARM: imx6: spin the cpu until hardware takes it down
  ARM i.MX6q: Add virtual 1/3.5 dividers in the LDB clock path

Also updates to Linux 3.6-rc2

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 8a211d36 a46d2619

Documentation/DocBook/filesystems.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -224,8 +224,8 @@ all your transactions. 
</para>



<para>

Then at umount time , in your put_super() (2.4) or write_super() (2.5)

you can then call journal_destroy() to clean up your in-core journal object.

Then at umount time , in your put_super() you can then call journal_destroy()

to clean up your in-core journal object.

</para>



<para>

Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt

+4 −4
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ Required properties: 
- compatible : Should be "fsl,<chip>-esdhc"



Optional properties:

- fsl,cd-internal : Indicate to use controller internal card detection

- fsl,wp-internal : Indicate to use controller internal write protection

- fsl,cd-controller : Indicate to use controller internal card detection

- fsl,wp-controller : Indicate to use controller internal write protection



Examples:
@@ -19,8 +19,8 @@ esdhc@70004000 { 
	compatible = "fsl,imx51-esdhc";

	reg = <0x70004000 0x4000>;

	interrupts = <1>;

	fsl,cd-internal;

	fsl,wp-internal;

	fsl,cd-controller;

	fsl,wp-controller;

};



esdhc@70008000 {

Documentation/filesystems/Locking

+0 −2
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ prototypes: 
	int (*drop_inode) (struct inode *);

	void (*evict_inode) (struct inode *);

	void (*put_super) (struct super_block *);

	void (*write_super) (struct super_block *);

	int (*sync_fs)(struct super_block *sb, int wait);

	int (*freeze_fs) (struct super_block *);

	int (*unfreeze_fs) (struct super_block *);
@@ -136,7 +135,6 @@ write_inode: 
drop_inode:				!!!inode->i_lock!!!

evict_inode:

put_super:		write

write_super:		read

sync_fs:		read

freeze_fs:		write

unfreeze_fs:		write

Documentation/filesystems/porting

+2 −3
Original line number Diff line number Diff line
@@ -94,9 +94,8 @@ protected. 
---

[mandatory]



BKL is also moved from around sb operations.  ->write_super() Is now called 

without BKL held.  BKL should have been shifted into individual fs sb_op

functions.  If you don't need it, remove it.  

BKL is also moved from around sb operations. BKL should have been shifted into

individual fs sb_op functions.  If you don't need it, remove it.



---

[informational]

Documentation/filesystems/vfs.txt

+0 −4
Original line number Diff line number Diff line
@@ -216,7 +216,6 @@ struct super_operations { 
        void (*drop_inode) (struct inode *);

        void (*delete_inode) (struct inode *);

        void (*put_super) (struct super_block *);

        void (*write_super) (struct super_block *);

        int (*sync_fs)(struct super_block *sb, int wait);

        int (*freeze_fs) (struct super_block *);

        int (*unfreeze_fs) (struct super_block *);
@@ -273,9 +272,6 @@ or bottom half). 
  put_super: called when the VFS wishes to free the superblock

	(i.e. unmount). This is called with the superblock lock held



  write_super: called when the VFS superblock needs to be written to

	disc. This method is optional



  sync_fs: called when VFS is writing out all dirty data associated with

  	a superblock. The second parameter indicates whether the method

	should wait until the write out has been completed. Optional.