[PATCH] Some patches around profiling

[David Disseldorp]

On Thu, 2 Oct 2014 17:00:12 +0200, Volker Lendecke wrote:

> Subject: [PATCH 4/7] profiling: Only compile profile/profile.c if profiling is
>  enabled
> 
> This conditional compile avoids some #ifdef WITH_PROFILE, which makes the code
> more readable

git-am throws an error when applying this patch. It looks as though the
first source3/profile/profile.c hunk is wrong:

@@ -29,14 +29,10 @@
 #define PROF_SHM_MAGIC 0x6349985
 #define PROF_SHM_VERSION 13
 
-#ifdef WITH_PROFILE
 #define IPC_PERMS ((S_IRUSR | S_IWUSR) | S_IRGRP | S_IROTH)
-#endif /* WITH_PROFILE */
 
-#ifdef WITH_PROFILE
 static int shm_id;
 static bool read_only;
-#endif
 
!--- this context is wrong...
 struct profile_header {
 	int prof_shm_magic;
!--- master has...
 struct profile_header *profile_h;
 struct profile_stats *profile_p;
!---

Please resend.

Cheers, David